Remove ScopedVector from chrome/browser/.

chrome/browser/speech/chrome_speech_recognition_manager_delegate.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 "chrome/browser/speech/chrome_speech_recognition_manager_delegate.h"
 
+#include <memory>
 #include <set>
 #include <string>
+#include <vector>
 
 #include "base/bind.h"
 #include "base/macros.h"
+#include "base/memory/ptr_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/synchronization/lock.h"
 #include "base/threading/thread_restrictions.h"
 #include "build/build_config.h"
 #include "chrome/browser/metrics/chrome_metrics_service_accessor.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/tab_contents/tab_util.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/common/url_constants.h"
 #include "components/prefs/pref_service.h"
@@ skipping 76 matching lines @@
     // extension using the (new) speech JS APIs, will be properly handled here.
     // TODO(primiano) turn this line into a DCHECK once speech input extension
     // API is deprecated.
     if (!web_contents)
       return;
 
     // Avoid multiple registrations for the same |web_contents|.
     if (FindWebContents(web_contents) != registered_web_contents_.end())
       return;
 
-    registered_web_contents_.push_back(new WebContentsTracker(
-        web_contents, base::Bind(&TabWatcher::OnTabClosed,
-                                 // |this| outlives WebContentsTracker.
-                                 base::Unretained(this), web_contents),
+    registered_web_contents_.push_back(base::MakeUnique<WebContentsTracker>(
+        web_contents,
+        base::Bind(&TabWatcher::OnTabClosed,
+                   // |this| outlives WebContentsTracker.
+                   base::Unretained(this), web_contents),
         render_process_id, render_view_id));
   }
 
   void OnTabClosed(content::WebContents* web_contents) {
-    ScopedVector<WebContentsTracker>::iterator iter =
-        FindWebContents(web_contents);
+    auto iter = FindWebContents(web_contents);
     DCHECK(iter != registered_web_contents_.end());
     int render_process_id = (*iter)->render_process_id();
     int render_view_id = (*iter)->render_view_id();
     registered_web_contents_.erase(iter);
 
     tab_closed_callback_.Run(render_process_id, render_view_id);
   }
 
  private:
   class WebContentsTracker : public content::WebContentsObserver {
@@ skipping 43 matching lines @@
   friend class base::RefCountedThreadSafe<TabWatcher>;
 
   ~TabWatcher() {
     // Must be destroyed on the UI thread due to |registrar_| non thread-safety.
     // TODO(lazyboy): Do we still need this?
     DCHECK_CURRENTLY_ON(BrowserThread::UI);
   }
 
   // Helper function to find the iterator in |registered_web_contents_| which
   // contains |web_contents|.
-  ScopedVector<WebContentsTracker>::iterator FindWebContents(
+  std::vector<std::unique_ptr<WebContentsTracker>>::iterator FindWebContents(
       content::WebContents* web_contents) {
-    for (ScopedVector<WebContentsTracker>::iterator i(
-             registered_web_contents_.begin());
+    for (auto i = registered_web_contents_.begin();
          i != registered_web_contents_.end(); ++i) {
       if ((*i)->GetWebContents() == web_contents)
         return i;
     }
 
     return registered_web_contents_.end();
   }
 
   // Keeps track of which WebContent(s) have been registered, in order to avoid
   // double registrations on WebContentsObserver and to pass the correct render
   // process id and render view id to |tab_closed_callback_| after the process
   // has gone away.
-  ScopedVector<WebContentsTracker> registered_web_contents_;
+  std::vector<std::unique_ptr<WebContentsTracker>> registered_web_contents_;
 
   // Callback used to notify, on the thread specified by |callback_thread_| the
   // closure of a registered tab.
   TabClosedCallback tab_closed_callback_;
 
   DISALLOW_COPY_AND_ASSIGN(TabWatcher);
 };
 
 ChromeSpeechRecognitionManagerDelegate
 ::ChromeSpeechRecognitionManagerDelegate() {
@@ skipping 145 matching lines @@
   // Otherwise this should be a regular tab contents.
   allowed = true;
   check_permission = true;
 #endif
 
   BrowserThread::PostTask(BrowserThread::IO, FROM_HERE,
                           base::Bind(callback, check_permission, allowed));
 }
 
 }  // namespace speech