From e45024b083bdc02163b47571dbc040e249eb427b Mon Sep 17 00:00:00 2001
From: Sami Kyostila <skyostil@chromium.org>
Date: Fri, 12 Aug 2016 15:29:37 +0100
Subject: [PATCH] Use stl utilities from the base namespace

The utilities in base/stl_util.h have been moved from the global
into the base namespace. This patch updates the call sites accordingly.

No functional changes.

Change-Id: I059d5d6299f947b1135672da170427d23ac4775e
Reviewed-on: https://chromium-review.googlesource.com/368640
Reviewed-by: Mark Mentovai <mark@chromium.org>
---
 DEPS                                                 | 2 +-
 minidump/minidump_handle_writer.cc                   | 2 +-
 minidump/minidump_simple_string_dictionary_writer.cc | 2 +-
 util/net/http_body.cc                                | 2 +-
 util/stdlib/pointer_container.h                      | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/DEPS b/DEPS
index 1a81f00d..fa7c80a4 100644
--- a/DEPS
+++ b/DEPS
@@ -25,7 +25,7 @@ deps = {
       '93cc6e2c23e4d5ebd179f388e67aa907d0dfd43d',
   'crashpad/third_party/mini_chromium/mini_chromium':
       Var('chromium_git') + '/chromium/mini_chromium@' +
-      '9c5463b4d4b3ad2540c718b7c87809ef4c1ea5c7',
+      '87f575d65c4700accac3b546ede66116c438ced1',
   'buildtools':
       Var('chromium_git') + '/chromium/buildtools.git@' +
       'c2f259809d5ede3275df5ea0842f0431990c4f98',
diff --git a/minidump/minidump_handle_writer.cc b/minidump/minidump_handle_writer.cc
index 73eeb0c7..c5d4659f 100644
--- a/minidump/minidump_handle_writer.cc
+++ b/minidump/minidump_handle_writer.cc
@@ -29,7 +29,7 @@ MinidumpHandleDataWriter::MinidumpHandleDataWriter()
 }
 
 MinidumpHandleDataWriter::~MinidumpHandleDataWriter() {
-  STLDeleteContainerPairSecondPointers(strings_.begin(), strings_.end());
+  base::STLDeleteContainerPairSecondPointers(strings_.begin(), strings_.end());
 }
 
 void MinidumpHandleDataWriter::InitializeFromSnapshot(
diff --git a/minidump/minidump_simple_string_dictionary_writer.cc b/minidump/minidump_simple_string_dictionary_writer.cc
index 92b3cc78..7a40cd4b 100644
--- a/minidump/minidump_simple_string_dictionary_writer.cc
+++ b/minidump/minidump_simple_string_dictionary_writer.cc
@@ -100,7 +100,7 @@ MinidumpSimpleStringDictionaryWriter::MinidumpSimpleStringDictionaryWriter()
 }
 
 MinidumpSimpleStringDictionaryWriter::~MinidumpSimpleStringDictionaryWriter() {
-  STLDeleteContainerPairSecondPointers(entries_.begin(), entries_.end());
+  base::STLDeleteContainerPairSecondPointers(entries_.begin(), entries_.end());
 }
 
 void MinidumpSimpleStringDictionaryWriter::InitializeFromMap(
diff --git a/util/net/http_body.cc b/util/net/http_body.cc
index 6bc6ec9e..b1bca19e 100644
--- a/util/net/http_body.cc
+++ b/util/net/http_body.cc
@@ -89,7 +89,7 @@ CompositeHTTPBodyStream::CompositeHTTPBodyStream(
 }
 
 CompositeHTTPBodyStream::~CompositeHTTPBodyStream() {
-  STLDeleteContainerPointers(parts_.begin(), parts_.end());
+  base::STLDeleteContainerPointers(parts_.begin(), parts_.end());
 }
 
 FileOperationResult CompositeHTTPBodyStream::GetBytesBuffer(uint8_t* buffer,
diff --git a/util/stdlib/pointer_container.h b/util/stdlib/pointer_container.h
index c8354659..576270df 100644
--- a/util/stdlib/pointer_container.h
+++ b/util/stdlib/pointer_container.h
@@ -37,7 +37,7 @@ class PointerContainer : public ContainerType {
   ~PointerContainer() {}
 
  private:
-  STLElementDeleter<ContainerType> pointer_deleter_;
+  base::STLElementDeleter<ContainerType> pointer_deleter_;
 
   DISALLOW_COPY_AND_ASSIGN(PointerContainer);
 };