Index: chrome/browser/ui/browser_instant_controller_unittest.cc |
diff --git a/chrome/browser/ui/browser_instant_controller_unittest.cc b/chrome/browser/ui/browser_instant_controller_unittest.cc |
index e1e24b97c54caf2a8753d76eb906fc27d6ed404f..79be65ec5c90d1afba3741f793685303fb862cbf 100644 |
--- a/chrome/browser/ui/browser_instant_controller_unittest.cc |
+++ b/chrome/browser/ui/browser_instant_controller_unittest.cc |
@@ -6,7 +6,6 @@ |
#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" |
@@ -116,7 +115,7 @@ class FakeWebContentsObserver : public content::WebContentsObserver { |
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]; |
@@ -131,13 +130,13 @@ TEST_F(BrowserInstantControllerTest, DefaultSearchProviderChanged) { |
<< 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]; |
@@ -164,7 +163,7 @@ TEST_F(BrowserInstantControllerTest, DefaultSearchProviderChanged) { |
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)); |
@@ -178,14 +177,14 @@ TEST_F(BrowserInstantControllerTest, GoogleBaseURLUpdated) { |
<< 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, |