Remove ScopedVector from importer.

chrome/browser/importer/firefox_importer_browsertest.cc

 // Copyright (c) 2013 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 <stddef.h>
 
 #include "base/files/file_path.h"
 #include "base/files/file_util.h"
 #include "base/files/scoped_temp_dir.h"
 #include "base/macros.h"
@@ skipping 200 matching lines @@
       const std::vector<autofill::AutofillEntry>& autofill_entries) override {
     EXPECT_EQ(arraysize(kFirefoxAutofillEntries), autofill_entries.size());
     for (size_t i = 0; i < arraysize(kFirefoxAutofillEntries); ++i) {
       EXPECT_EQ(kFirefoxAutofillEntries[i].name,
                 base::UTF16ToUTF8(autofill_entries[i].key().name()));
       EXPECT_EQ(kFirefoxAutofillEntries[i].value,
                 base::UTF16ToUTF8(autofill_entries[i].key().value()));
     }
   }
 
-  void AddKeywords(ScopedVector<TemplateURL> template_urls,
+  void AddKeywords(TemplateURLService::OwnedTemplateURLVector template_urls,
                    bool unique_on_host_and_path) override {
     for (size_t i = 0; i < template_urls.size(); ++i) {

[Peter Kasting, 2016/09/01 22:55:41]

Nit: While here: This loop (and the inner one, I think) could use range-based
for

[Avi (use Gerrit), 2016/09/01 23:28:33]

Done.

       // The order might not be deterministic, look in the expected list for
       // that template URL.
       bool found = false;
       const base::string16& imported_keyword = template_urls[i]->keyword();
       for (size_t j = 0; j < arraysize(kFirefoxKeywords); ++j) {
         const base::string16 expected_keyword = base::WideToUTF16(
             use_keyword_in_json_ ?
             kFirefoxKeywords[j].keyword_in_json :
             kFirefoxKeywords[j].keyword_in_sqlite);
         if (imported_keyword == expected_keyword) {
@@ skipping 121 matching lines @@
   scoped_refptr<FirefoxObserver> observer(new FirefoxObserver(true));
   FirefoxImporterBrowserTest("firefox_profile", observer.get(), observer.get());
 }
 
 IN_PROC_BROWSER_TEST_F(FirefoxProfileImporterBrowserTest,
                        MAYBE_IMPORTER(Firefox320Importer)) {
   scoped_refptr<FirefoxObserver> observer(new FirefoxObserver(true));
   FirefoxImporterBrowserTest("firefox320_profile", observer.get(),
                              observer.get());
 }