Remove ScopedVector from search_engines.

components/search_engines/util.h

 // 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.
 
 #ifndef COMPONENTS_SEARCH_ENGINES_UTIL_H_
 #define COMPONENTS_SEARCH_ENGINES_UTIL_H_
 
 // This file contains utility functions for search engine functionality.
+
 #include <memory>
 #include <set>
 #include <string>
 #include <vector>
 
 #include "base/strings/string16.h"
 #include "components/search_engines/template_url_service.h"
 
-template <typename T>
-class ScopedVector;
-
 class KeywordWebDataService;
 class PrefService;
 class TemplateURL;
 class WDTypedResult;
 
 // Returns the short name of the default search engine, or the empty string if
 // none is set.
 base::string16 GetDefaultSearchEngineName(TemplateURLService* service);
 
 // Returns a GURL that searches for |terms| using the default search engine of
@@ skipping 40 matching lines @@
   std::vector<TemplateURLData> added_engines;
 };
 
 // Given the user's current URLs and the current set of prepopulated URLs,
 // produces the set of actions (see above) required to make the user's URLs
 // reflect the prepopulate data.  |default_search_provider| is used to avoid
 // placing the current default provider on the "to be removed" list.
 //
 // NOTE: Takes ownership of, and clears, |prepopulated_urls|.
 ActionsFromPrepopulateData CreateActionsFromCurrentPrepopulateData(
-    ScopedVector<TemplateURLData>* prepopulated_urls,
+    std::vector<std::unique_ptr<TemplateURLData>>* prepopulated_urls,
     const TemplateURLService::OwnedTemplateURLVector& existing_urls,
     const TemplateURL* default_search_provider);
 
 // Processes the results of KeywordWebDataService::GetKeywords, combining it
 // with prepopulated search providers to result in:
 //  * a set of template_urls (search providers). The caller owns the
 //    TemplateURL* returned in template_urls.
 //  * whether there is a new resource keyword version (and the value).
 //    |*new_resource_keyword_version| is set to 0 if no new value. Otherwise,
 //    it is the new value.
@@ skipping 33 matching lines @@
 // any were found.
 bool DeDupeEncodings(std::vector<std::string>* encodings);
 
 // Removes (and deletes) TemplateURLs from |template_urls| and |service| if they
 // have duplicate prepopulate ids. If |removed_keyword_guids| is not NULL, the
 // Sync GUID of each item removed from the DB will be added to it. This is a
 // helper used by GetSearchProvidersUsingKeywordResult(), but is declared here
 // so it's accessible by unittests.
 void RemoveDuplicatePrepopulateIDs(
     KeywordWebDataService* service,
-    const ScopedVector<TemplateURLData>& prepopulated_urls,
+    const std::vector<std::unique_ptr<TemplateURLData>>& prepopulated_urls,
     TemplateURL* default_search_provider,
     TemplateURLService::OwnedTemplateURLVector* template_urls,
     const SearchTermsData& search_terms_data,
     std::set<std::string>* removed_keyword_guids);
 
 TemplateURLService::OwnedTemplateURLVector::iterator FindTemplateURL(
     TemplateURLService::OwnedTemplateURLVector* urls,
     const TemplateURL* url);
 
 #endif  // COMPONENTS_SEARCH_ENGINES_UTIL_H_