Enable Chrome to tweak search engines for some locales

chrome/browser/search_engines/chrome_template_url_service_client.cc

 // Copyright 2014 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/search_engines/chrome_template_url_service_client.h"
 
 #include "base/memory/ptr_util.h"
 #include "components/history/core/browser/history_service.h"
 #include "components/search_engines/template_url_service.h"
 #include "extensions/common/constants.h"
@@ skipping 52 matching lines @@
                               history::SOURCE_BROWSED, false);
 }
 
 void ChromeTemplateURLServiceClient::RestoreExtensionInfoIfNecessary(
     TemplateURL* template_url) {
   const TemplateURLData& data = template_url->data();
   GURL url(data.url());
   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. :)

   }
 }
 
 void ChromeTemplateURLServiceClient::OnURLVisited(
     history::HistoryService* history_service,
     ui::PageTransition transition,
     const history::URLRow& row,
     const history::RedirectList& redirects,
     base::Time visit_time) {
   DCHECK_EQ(history_service_, history_service);
   if (!owner_)
     return;
 
   TemplateURLService::URLVisitedDetails visited_details;
   visited_details.url = row.url();
   visited_details.is_keyword_transition =
       ui::PageTransitionCoreTypeIs(transition, ui::PAGE_TRANSITION_KEYWORD);
   owner_->OnHistoryURLVisited(visited_details);
 }