Enable Chrome to tweak search engines for some locales

chrome/browser/search_engines/chrome_template_url_service_client.cc

Index: chrome/browser/search_engines/chrome_template_url_service_client.cc
diff --git a/chrome/browser/search_engines/chrome_template_url_service_client.cc b/chrome/browser/search_engines/chrome_template_url_service_client.cc
index c2a1ba8d97c03c4cb715c23832bab898146b6fdd..ba7ec07c52a937afd27f3c76273b8008b429378f 100644
--- a/chrome/browser/search_engines/chrome_template_url_service_client.cc
+++ b/chrome/browser/search_engines/chrome_template_url_service_client.cc
@@ -70,8 +70,8 @@ void ChromeTemplateURLServiceClient::RestoreExtensionInfoIfNecessary(
   if (url.SchemeIs(extensions::kExtensionScheme)) {
     const std::string& extension_id = url.host();
     template_url->set_extension_info(
-        base::MakeUnique<TemplateURL::AssociatedExtensionInfo>(
-            TemplateURL::OMNIBOX_API_EXTENSION, extension_id));
+        base::MakeUnique<TemplateURL::AssociatedExtensionInfo>(extension_id));
+    template_url->set_type(TemplateURL::OMNIBOX_API_EXTENSION);

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

This was the thing that worried me, looking through the existing calls.  I feel
like there should be a way to avoid doing this.

Looking at how this function is called, it seems like maybe we can just nuke all
this stuff because it's associated with some stuff vasilii TODOd to remove?  I
sent him an email and CCed you on it.  In the meantime, let's not block on that,
but if he's able to clean this up, then hopefully with the other comments I
suggest in this review we can nuke set_type().

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

Added a todo track this. Agreed that we shouldn't block on it. :)

   }
 }