| Index: components/search_engines/template_url_prepopulate_data_unittest.cc
|
| diff --git a/components/search_engines/template_url_prepopulate_data_unittest.cc b/components/search_engines/template_url_prepopulate_data_unittest.cc
|
| index 1a22c125b14cbc4eb3f54c7e78b37c93c3ecb9bf..e57a940cf8947923a3ddc2deaa1f7e8a6dd5cb0d 100644
|
| --- a/components/search_engines/template_url_prepopulate_data_unittest.cc
|
| +++ b/components/search_engines/template_url_prepopulate_data_unittest.cc
|
| @@ -12,7 +12,6 @@
|
| #include "base/command_line.h"
|
| #include "base/files/scoped_temp_dir.h"
|
| #include "base/macros.h"
|
| -#include "base/memory/scoped_vector.h"
|
| #include "base/strings/utf_string_conversions.h"
|
| #include "components/google/core/browser/google_switches.h"
|
| #include "components/pref_registry/testing_pref_service_syncable.h"
|
| @@ -106,7 +105,7 @@ TEST_F(TemplateURLPrepopulateDataTest, UniqueIDs) {
|
| for (size_t i = 0; i < arraysize(kCountryIds); ++i) {
|
| prefs_.SetInteger(prefs::kCountryIDAtInstall, kCountryIds[i]);
|
| size_t default_index;
|
| - ScopedVector<TemplateURLData> urls =
|
| + std::vector<std::unique_ptr<TemplateURLData>> urls =
|
| TemplateURLPrepopulateData::GetPrepopulatedEngines(&prefs_,
|
| &default_index);
|
| std::set<int> unique_ids;
|
| @@ -139,7 +138,7 @@ TEST_F(TemplateURLPrepopulateDataTest, ProvidersFromPrefs) {
|
| EXPECT_EQ(1, version);
|
|
|
| size_t default_index;
|
| - ScopedVector<TemplateURLData> t_urls =
|
| + std::vector<std::unique_ptr<TemplateURLData>> t_urls =
|
| TemplateURLPrepopulateData::GetPrepopulatedEngines(&prefs_,
|
| &default_index);
|
|
|
| @@ -231,7 +230,7 @@ TEST_F(TemplateURLPrepopulateDataTest, ClearProvidersFromPrefs) {
|
| EXPECT_EQ(TemplateURLPrepopulateData::kCurrentDataVersion, version);
|
|
|
| size_t default_index;
|
| - ScopedVector<TemplateURLData> t_urls =
|
| + std::vector<std::unique_ptr<TemplateURLData>> t_urls =
|
| TemplateURLPrepopulateData::GetPrepopulatedEngines(&prefs_,
|
| &default_index);
|
| ASSERT_FALSE(t_urls.empty());
|
| @@ -260,7 +259,7 @@ TEST_F(TemplateURLPrepopulateDataTest, ProvidersFromPrepopulated) {
|
| // Use United States.
|
| prefs_.SetInteger(prefs::kCountryIDAtInstall, 'U'<<8|'S');
|
| size_t default_index;
|
| - ScopedVector<TemplateURLData> t_urls =
|
| + std::vector<std::unique_ptr<TemplateURLData>> t_urls =
|
| TemplateURLPrepopulateData::GetPrepopulatedEngines(&prefs_,
|
| &default_index);
|
|
|
|
|