Remove ScopedVector from importer.

chrome/browser/importer/profile_writer.cc

 // 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.
 
 #include "chrome/browser/importer/profile_writer.h"
 
 #include <stddef.h>
 
 #include <map>
 #include <set>
@@ skipping 297 matching lines @@
         // those shown in the default list.  If there are multiple potential
         // defaults, favor the first one, which should be the more commonly used
         // one.
         (*host_path_map)[host_path] = template_urls[i];
       }
     }  // else case, TemplateURL doesn't have a search url, doesn't support
        // replacement, or doesn't have valid GURL. Ignore it.
   }
 }
 
-void ProfileWriter::AddKeywords(ScopedVector<TemplateURL> template_urls,
-                                bool unique_on_host_and_path) {
+void ProfileWriter::AddKeywords(
+    TemplateURLService::OwnedTemplateURLVector template_urls,
+    bool unique_on_host_and_path) {
   TemplateURLService* model =
       TemplateURLServiceFactory::GetForProfile(profile_);
   HostPathMap host_path_map;
   if (unique_on_host_and_path)
     BuildHostPathMap(model, &host_path_map);
 
-  for (ScopedVector<TemplateURL>::iterator i = template_urls.begin();
-       i != template_urls.end(); ++i) {
+  for (auto& turl : template_urls) {
     // TemplateURLService requires keywords to be unique. If there is already a
     // TemplateURL with this keyword, don't import it again.
-    if (model->GetTemplateURLForKeyword((*i)->keyword()) != nullptr)
+    if (model->GetTemplateURLForKeyword(turl->keyword()) != nullptr)
       continue;
 
     // For search engines if there is already a keyword with the same
     // host+path, we don't import it. This is done to avoid both duplicate
     // search providers (such as two Googles, or two Yahoos) as well as making
     // sure the search engines we provide aren't replaced by those from the
     // imported browser.
-    if (unique_on_host_and_path &&
-        (host_path_map.find(BuildHostPathKey(
-            *i, model->search_terms_data(), true)) != host_path_map.end()))
+    if (unique_on_host_and_path && (host_path_map.find(BuildHostPathKey(
+                                        turl.get(), model->search_terms_data(),
+                                        true)) != host_path_map.end()))
       continue;
 
     // Only add valid TemplateURLs to the model.
-    if ((*i)->url_ref().IsValid(model->search_terms_data())) {
-      model->Add(base::WrapUnique(*i));
-      *i = nullptr;  // Prevent the vector from deleting *i later.
-    }
+    if (turl->url_ref().IsValid(model->search_terms_data()))
+      model->Add(std::move(turl));
   }
 }
 
 void ProfileWriter::AddAutofillFormDataEntries(
     const std::vector<autofill::AutofillEntry>& autofill_entries) {
   scoped_refptr<autofill::AutofillWebDataService> web_data_service =
       WebDataServiceFactory::GetAutofillWebDataForProfile(
           profile_, ServiceAccessType::EXPLICIT_ACCESS);
   if (web_data_service.get())
     web_data_service->UpdateAutofillEntries(autofill_entries);
 }
 
 ProfileWriter::~ProfileWriter() {}