Enable Chrome to tweak search engines for some locales

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

Index: chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc
diff --git a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc
index 3524a085e21188413c857bb5babc2a097fd2294f..2112f5e9159e55f2a83061d8a8824c9f7d076dbd 100644
--- a/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc
+++ b/chrome/browser/extensions/api/settings_overrides/settings_overrides_api.cc
@@ -269,17 +269,19 @@ void SettingsOverridesAPI::RegisterSearchProvider(
   DCHECK(settings);
   DCHECK(settings->search_engine);
   std::unique_ptr<TemplateURL::AssociatedExtensionInfo> info(
-      new TemplateURL::AssociatedExtensionInfo(
-          TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION, extension->id()));
+      new TemplateURL::AssociatedExtensionInfo(extension->id()));

[Peter Kasting, 2016/09/21 21:45:08]

Nit: While here, use MakeUnique():

  auto info =
      base::MakeUnique<TemplateURL::AssociatedExtensionInfo>(extension->id());

(I like using "auto" in this sort of case to avoid duplicating the type name;
you're welcome to do it for |turl| too.)

[Ian Wen, 2016/09/21 23:12:38]

Done.

   info->wants_to_be_default_engine = settings->search_engine->is_default;
+
   ExtensionPrefs* prefs = ExtensionPrefs::Get(profile_);
   info->install_time = prefs->GetInstallTime(extension->id());
   std::string install_parameter = prefs->GetInstallParam(extension->id());
   std::unique_ptr<TemplateURLData> data = ConvertSearchProvider(
       profile_->GetPrefs(), *settings->search_engine, install_parameter);
   data->show_in_default_list = info->wants_to_be_default_engine;
-  url_service_->AddExtensionControlledTURL(base::MakeUnique<TemplateURL>(*data),
-                                           std::move(info));
+

[Peter Kasting, 2016/09/21 21:45:08]

Nit: I'd put this blank line below the next statement rather than above it, so
the blocks are basically "build each arg for the function call, then finally
call the function".

[Ian Wen, 2016/09/21 23:12:38]

Done.

+  std::unique_ptr<TemplateURL> turl = base::MakeUnique<TemplateURL>(
+      *data, TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION);
+  url_service_->AddExtensionControlledTURL(std::move(turl), std::move(info));
 }
 
 template <>