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 pointer_deleter_; + base::STLElementDeleter pointer_deleter_; DISALLOW_COPY_AND_ASSIGN(PointerContainer); };