Remove ScopedVector from chrome/browser/ui.

chrome/browser/ui/browser_instant_controller_unittest.cc

 // Copyright 2013 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 <stddef.h>
 
 #include "base/gtest_prod_util.h"
 #include "base/macros.h"
-#include "base/memory/scoped_vector.h"
 #include "base/metrics/field_trial.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/search/instant_service.h"
 #include "chrome/browser/search/instant_service_observer.h"
 #include "chrome/browser/search/instant_unittest_base.h"
 #include "chrome/browser/search/search.h"
 #include "chrome/browser/ui/browser_instant_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/url_constants.h"
@@ skipping 89 matching lines @@
 
  private:
   content::WebContents* contents_;
   const GURL& url_;
   GURL current_url_;
   int num_reloads_;
 };
 
 TEST_F(BrowserInstantControllerTest, DefaultSearchProviderChanged) {
   size_t num_tests = arraysize(kTabReloadTestCasesFinalProviderNotGoogle);
-  ScopedVector<FakeWebContentsObserver> observers;
+  std::vector<std::unique_ptr<FakeWebContentsObserver>> observers;
   for (size_t i = 0; i < num_tests; ++i) {
     const TabReloadTestCase& test =
         kTabReloadTestCasesFinalProviderNotGoogle[i];
     AddTab(browser(), GURL(test.start_url));
     content::WebContents* contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
     // Validate initial instant state.
     EXPECT_EQ(test.start_in_instant_process,
         instant_service_->IsInstantProcess(
           contents->GetRenderProcessHost()->GetID()))
       << test.description;
 
     // Setup an observer to verify reload or absence thereof.
-    observers.push_back(new FakeWebContentsObserver(contents));
+    observers.push_back(base::MakeUnique<FakeWebContentsObserver>(contents));
   }
 
   SetUserSelectedDefaultSearchProvider("https://bar.com/");
 
   for (size_t i = 0; i < num_tests; ++i) {
-    FakeWebContentsObserver* observer = observers[i];
+    FakeWebContentsObserver* observer = observers[i].get();
     const TabReloadTestCase& test =
         kTabReloadTestCasesFinalProviderNotGoogle[i];
 
     if (test.should_reload) {
       // Validate final instant state.
       EXPECT_EQ(test.end_in_instant_process,
                 search::ShouldAssignURLToInstantRenderer(
                     observer->current_url(), profile()))
           << test.description;
     }
 
     // Ensure only the expected tabs(contents) reloaded.
     base::RunLoop loop;
     loop.RunUntilIdle();
     EXPECT_EQ(test.should_reload ? 1 : 0, observer->num_reloads())
       << test.description;
 
     if (test.end_in_local_ntp) {
       EXPECT_EQ(GURL(chrome::kChromeSearchLocalNtpUrl), observer->current_url())
           << test.description;
     }
   }
 }
 
 TEST_F(BrowserInstantControllerTest, GoogleBaseURLUpdated) {
   const size_t num_tests = arraysize(kTabReloadTestCasesFinalProviderGoogle);
-  ScopedVector<FakeWebContentsObserver> observers;
+  std::vector<std::unique_ptr<FakeWebContentsObserver>> observers;
   for (size_t i = 0; i < num_tests; ++i) {
     const TabReloadTestCase& test = kTabReloadTestCasesFinalProviderGoogle[i];
     AddTab(browser(), GURL(test.start_url));
     content::WebContents* contents =
       browser()->tab_strip_model()->GetActiveWebContents();
 
     // Validate initial instant state.
     EXPECT_EQ(test.start_in_instant_process,
         instant_service_->IsInstantProcess(
           contents->GetRenderProcessHost()->GetID()))
       << test.description;
 
     // Setup an observer to verify reload or absence thereof.
-    observers.push_back(new FakeWebContentsObserver(contents));
+    observers.push_back(base::MakeUnique<FakeWebContentsObserver>(contents));
   }
 
   NotifyGoogleBaseURLUpdate("https://www.google.es/");
 
   for (size_t i = 0; i < num_tests; ++i) {
     const TabReloadTestCase& test = kTabReloadTestCasesFinalProviderGoogle[i];
-    FakeWebContentsObserver* observer = observers[i];
+    FakeWebContentsObserver* observer = observers[i].get();
 
     // Validate final instant state.
     EXPECT_EQ(test.end_in_instant_process,
               search::ShouldAssignURLToInstantRenderer(observer->current_url(),
                                                        profile()))
         << test.description;
 
     // Ensure only the expected tabs(contents) reloaded.
     base::RunLoop loop;
     loop.RunUntilIdle();
@@ skipping 21 matching lines @@
 
   browser.reset(NULL);
   window.reset(NULL);
   EXPECT_FALSE(IsInstantServiceObserver(bic))
     << "New BrowserInstantController should register as InstantServiceObserver";
 }
 
 }  // namespace
 
 }  // namespace chrome