Remove some uses of stl_util's STLDeleteContainerPointers.

content/public/test/test_navigation_observer.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/public/test/test_navigation_observer.h"
 
 #include "base/bind.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "base/stl_util.h"
 #include "content/browser/web_contents/web_contents_impl.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 namespace content {
 
 class TestNavigationObserver::TestWebContentsObserver
     : public WebContentsObserver {
  public:
   TestWebContentsObserver(TestNavigationObserver* parent,
@@ skipping 80 matching lines @@
       web_contents_created_callback_(
           base::Bind(
               &TestNavigationObserver::OnWebContentsCreated,
               base::Unretained(this))) {
   if (web_contents)
     RegisterAsObserver(web_contents);
 }
 
 TestNavigationObserver::~TestNavigationObserver() {
   StopWatchingNewWebContents();
-
-  base::STLDeleteContainerPointers(web_contents_observers_.begin(),
-                                   web_contents_observers_.end());
 }
 
 void TestNavigationObserver::Wait() {
   message_loop_runner_->Run();
 }
 
 void TestNavigationObserver::StartWatchingNewWebContents() {
   WebContentsImpl::FriendZone::AddCreatedCallbackForTesting(
       web_contents_created_callback_);
 }
 
 void TestNavigationObserver::StopWatchingNewWebContents() {
   WebContentsImpl::FriendZone::RemoveCreatedCallbackForTesting(
       web_contents_created_callback_);
 }
 
 void TestNavigationObserver::RegisterAsObserver(WebContents* web_contents) {
   web_contents_observers_.insert(
-      new TestWebContentsObserver(this, web_contents));
+      base::MakeUnique<TestWebContentsObserver>(this, web_contents));
 }
 
 void TestNavigationObserver::OnWebContentsCreated(WebContents* web_contents) {
   RegisterAsObserver(web_contents);
 }
 
 void TestNavigationObserver::OnWebContentsDestroyed(
     TestWebContentsObserver* observer,
     WebContents* web_contents) {
-  web_contents_observers_.erase(observer);
-  delete observer;
+  web_contents_observers_.erase(std::find_if(
+      web_contents_observers_.begin(), web_contents_observers_.end(),
+      [observer](const std::unique_ptr<TestWebContentsObserver>& ptr) {
+        return ptr.get() == observer;
+      }));
 }
 
 void TestNavigationObserver::OnNavigationEntryCommitted(
     TestWebContentsObserver* observer,
     WebContents* web_contents,
     const LoadCommittedDetails& load_details) {
   navigation_started_ = true;
 }
 
 void TestNavigationObserver::OnDidAttachInterstitialPage(
@@ skipping 37 matching lines @@
 
 void TestNavigationObserver::OnDidCommitProvisionalLoadForFrame(
     RenderFrameHost* render_frame_host,
     const GURL& url,
     ui::PageTransition transition_type) {
   last_navigation_url_ = url;
   last_navigation_succeeded_ = true;
 }
 
 }  // namespace content