Remove ScopedVector from search_engines.

components/search_engines/default_search_manager_unittest.cc

 // Copyright 2014 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 "components/search_engines/default_search_manager.h"
 
 #include <stddef.h>
 
 #include <memory>
 
@@ skipping 174 matching lines @@
   manager.SetUserSelectedDefaultSearchEngine(data);
   TemplateURLData* read_data = manager.GetDefaultSearchEngine(NULL);
   ExpectSimilar(&data, read_data);
 }
 
 // Test DefaultSearchmanager handles user-selected DSEs correctly.
 TEST_F(DefaultSearchManagerTest, DefaultSearchSetByUserPref) {
   size_t default_search_index = 0;
   DefaultSearchManager manager(pref_service(),
                                DefaultSearchManager::ObserverCallback());
-  ScopedVector<TemplateURLData> prepopulated_urls =
+  std::vector<std::unique_ptr<TemplateURLData>> prepopulated_urls =
       TemplateURLPrepopulateData::GetPrepopulatedEngines(pref_service(),
                                                          &default_search_index);
   DefaultSearchManager::Source source = DefaultSearchManager::FROM_POLICY;
   // If no user pref is set, we should use the pre-populated values.
-  ExpectSimilar(prepopulated_urls[default_search_index],
+  ExpectSimilar(prepopulated_urls[default_search_index].get(),
                 manager.GetDefaultSearchEngine(&source));
   EXPECT_EQ(DefaultSearchManager::FROM_FALLBACK, source);
 
   // Setting a user pref overrides the pre-populated values.
   std::unique_ptr<TemplateURLData> data = GenerateDummyTemplateURLData("user");
   manager.SetUserSelectedDefaultSearchEngine(*data.get());
 
   ExpectSimilar(data.get(), manager.GetDefaultSearchEngine(&source));
   EXPECT_EQ(DefaultSearchManager::FROM_USER, source);
 
   // Updating the user pref (externally to this instance of
   // DefaultSearchManager) triggers an update.
   std::unique_ptr<TemplateURLData> new_data =
       GenerateDummyTemplateURLData("user2");
   DefaultSearchManager other_manager(pref_service(),
                                      DefaultSearchManager::ObserverCallback());
   other_manager.SetUserSelectedDefaultSearchEngine(*new_data.get());
 
   ExpectSimilar(new_data.get(), manager.GetDefaultSearchEngine(&source));
   EXPECT_EQ(DefaultSearchManager::FROM_USER, source);
 
   // Clearing the user pref should cause the default search to revert to the
   // prepopulated vlaues.
   manager.ClearUserSelectedDefaultSearchEngine();
-  ExpectSimilar(prepopulated_urls[default_search_index],
+  ExpectSimilar(prepopulated_urls[default_search_index].get(),
                 manager.GetDefaultSearchEngine(&source));
   EXPECT_EQ(DefaultSearchManager::FROM_FALLBACK, source);
 }
 
 // Test that DefaultSearch manager detects changes to kSearchProviderOverrides.
 TEST_F(DefaultSearchManagerTest, DefaultSearchSetByOverrides) {
   SetOverrides(pref_service(), false);
   size_t default_search_index = 0;
   DefaultSearchManager manager(pref_service(),
                                DefaultSearchManager::ObserverCallback());
-  ScopedVector<TemplateURLData> prepopulated_urls =
+  std::vector<std::unique_ptr<TemplateURLData>> prepopulated_urls =
       TemplateURLPrepopulateData::GetPrepopulatedEngines(pref_service(),
                                                          &default_search_index);
 
   DefaultSearchManager::Source source = DefaultSearchManager::FROM_POLICY;
   TemplateURLData first_default(*manager.GetDefaultSearchEngine(&source));
-  ExpectSimilar(prepopulated_urls[default_search_index], &first_default);
+  ExpectSimilar(prepopulated_urls[default_search_index].get(), &first_default);
   EXPECT_EQ(DefaultSearchManager::FROM_FALLBACK, source);
 
   // Update the overrides:
   SetOverrides(pref_service(), true);
   prepopulated_urls = TemplateURLPrepopulateData::GetPrepopulatedEngines(
       pref_service(), &default_search_index);
 
   // Make sure DefaultSearchManager updated:
-  ExpectSimilar(prepopulated_urls[default_search_index],
+  ExpectSimilar(prepopulated_urls[default_search_index].get(),
                 manager.GetDefaultSearchEngine(&source));
   EXPECT_EQ(DefaultSearchManager::FROM_FALLBACK, source);
   EXPECT_NE(manager.GetDefaultSearchEngine(NULL)->short_name(),
             first_default.short_name());
   EXPECT_NE(manager.GetDefaultSearchEngine(NULL)->keyword(),
             first_default.keyword());
 }
 
 // Test DefaultSearchManager handles policy-enforced DSEs correctly.
 TEST_F(DefaultSearchManagerTest, DefaultSearchSetByPolicy) {
@@ skipping 62 matching lines @@
 
   ExpectSimilar(extension_data_3.get(),
                 manager.GetDefaultSearchEngine(&source));
   EXPECT_EQ(DefaultSearchManager::FROM_EXTENSION, source);
 
   manager.ClearExtensionControlledDefaultSearchEngine();
 
   ExpectSimilar(data.get(), manager.GetDefaultSearchEngine(&source));
   EXPECT_EQ(DefaultSearchManager::FROM_USER, source);
 }