Remove ScopedVector from importer.

chrome/browser/importer/profile_writer.h

 // Copyright (c) 2012 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 CHROME_BROWSER_IMPORTER_PROFILE_WRITER_H_
 #define CHROME_BROWSER_IMPORTER_PROFILE_WRITER_H_
 
 #include <vector>
 
 #include "base/macros.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_vector.h"
 #include "base/strings/string16.h"
 #include "base/time/time.h"
 #include "build/build_config.h"
 #include "components/favicon_base/favicon_usage_data.h"
 #include "components/history/core/browser/history_types.h"
+#include "components/search_engines/template_url_service.h"
 #include "url/gurl.h"
 
 struct ImportedBookmarkEntry;
 class Profile;
-class TemplateURL;
 
 namespace autofill {
 struct PasswordForm;
 class AutofillEntry;
 }
 
 #if defined(OS_WIN)
 struct IE7PasswordInfo;
 #endif
 
@@ skipping 38 matching lines @@
   // If a folder with this name already exists, then the name is uniquified.
   // For example, if |first_folder_name| is 'Imported from IE' and a folder with
   // the name 'Imported from IE' already exists in the bookmarks toolbar, then
   // we will instead create a subfolder named 'Imported from IE (1)'.
   virtual void AddBookmarks(
       const std::vector<ImportedBookmarkEntry>& bookmarks,
       const base::string16& top_level_folder_name);
 
   virtual void AddFavicons(const favicon_base::FaviconUsageDataList& favicons);
 
-  // Adds the TemplateURLs in |template_urls| to the local store.  The local
-  // store becomes the owner of the TemplateURLs.  Some TemplateURLs in
-  // |template_urls| may conflict (same keyword or same host name in the URL)
-  // with existing TemplateURLs in the local store, in which case the existing
-  // ones take precedence and the duplicates in |template_urls| are deleted.
-  // If |unique_on_host_and_path| is true, a TemplateURL is only added if there
-  // is not an existing TemplateURL that has a replaceable search url with the
-  // same host+path combination.
-  virtual void AddKeywords(ScopedVector<TemplateURL> template_urls,
-                           bool unique_on_host_and_path);
+  // Adds the TemplateURLs in |template_urls| to the local store.
+  // Some TemplateURLs in |template_urls| may conflict (same keyword or same
+  // host name in the URL) with existing TemplateURLs in the local store, in
+  // which case the existing ones take precedence and the duplicates in
+  // |template_urls| are deleted. If |unique_on_host_and_path| is true, a
+  // TemplateURL is only added if there is not an existing TemplateURL that has
+  // a replaceable search url with the same host+path combination.
+  virtual void AddKeywords(
+      TemplateURLService::OwnedTemplateURLVector template_urls,
+      bool unique_on_host_and_path);
 
   // Adds the imported autofill entries to the autofill database.
   virtual void AddAutofillFormDataEntries(
       const std::vector<autofill::AutofillEntry>& autofill_entries);
 
  protected:
   friend class base::RefCountedThreadSafe<ProfileWriter>;
 
   virtual ~ProfileWriter();
 
  private:
   Profile* const profile_;
 
   DISALLOW_COPY_AND_ASSIGN(ProfileWriter);
 };
 
 #endif  // CHROME_BROWSER_IMPORTER_PROFILE_WRITER_H_