Remove ScopedVector from search_engines.

chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc

 // Copyright 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 "chrome/browser/extensions/api/settings_overrides/settings_overrides_api.h"
 
 #include <stddef.h>
 #include <utility>
 
 #include "base/lazy_instance.h"
@@ skipping 31 matching lines @@
   base::ReplaceSubstringsAfterOffset(&str, 0, "__PARAM__", install_parameter);
   return str;
 }
 
 // Find the prepopulated search engine with the given id.
 bool GetPrepopulatedSearchProvider(PrefService* prefs,
                                    int prepopulated_id,
                                    TemplateURLData* data) {
   DCHECK(data);
   size_t default_index;
-  ScopedVector<TemplateURLData> engines =
+  std::vector<std::unique_ptr<TemplateURLData>> engines =
       TemplateURLPrepopulateData::GetPrepopulatedEngines(prefs, &default_index);
-  for (ScopedVector<TemplateURLData>::iterator i = engines.begin();
-       i != engines.end();
-       ++i) {
-    if ((*i)->prepopulate_id == prepopulated_id) {
-      *data = **i;
+  for (const auto& engine : engines) {
+    if (engine->prepopulate_id == prepopulated_id) {
+      *data = *engine;

[Devlin, 2016/09/02 00:49:09]

Total drive-by nit: it looks like there's no reason to do a copy here rather
than use the std::unique_ptr we already have.  Can you put:
// TODO(devlin): Use the std::unique_ptr instead of a copy here.
?

(It's probably out of scope for this change, but no reason to cause extra work!
:))

[Peter Kasting, 2016/09/02 01:06:25]

Looks like just fixing now would be pretty simple.  We can change this function
to:

std::unique_ptr<TemplateURLData> GetPrepopulatedSearchProvider(
    PrefService* prefs,
    int prepopulated_id) {
  ...
  for (auto& engine : engines) {
    if (engine->prepopulate_id == prepopulated_id)
      return std::move(engine);
  }  // Note, this loop could optionally be replaced by find_if()
  return nullptr;
}

Then in ConvertSearchProvider():

  std::unique_ptr<TemplateURLData> data;
  if (search_provider.prepopulated_id) {
    data = GetPrepopulatedSearchProvider(prefs,
                                         *search_provider.prepopulated_id);
    if (!data) {
      VLOG(1) << ...;
    }
  }

  ... change "data." to "data->" here ...

[Avi (use Gerrit), 2016/09/02 01:08:37]

Fixed, ptal.

[Devlin, 2016/09/02 01:24:08]

Thanks!  I didn't want to volunteer you for more work than necessary as an
unrelated drive-by. :)

       return true;
     }
   }
   return false;
 }
 
 TemplateURLData ConvertSearchProvider(
     PrefService* prefs,
     const ChromeSettingsOverrides::Search_provider& search_provider,
     const std::string& install_parameter) {
@@ skipping 215 matching lines @@
 
 template <>
 void BrowserContextKeyedAPIFactory<
     SettingsOverridesAPI>::DeclareFactoryDependencies() {
   DependsOn(ExtensionPrefsFactory::GetInstance());
   DependsOn(PreferenceAPI::GetFactoryInstance());
   DependsOn(TemplateURLServiceFactory::GetInstance());
 }
 
 }  // namespace extensions