Enable Chrome to tweak search engines for some locales

chrome/browser/search_engines/template_url_service_unittest.cc

Index: chrome/browser/search_engines/template_url_service_unittest.cc
diff --git a/chrome/browser/search_engines/template_url_service_unittest.cc b/chrome/browser/search_engines/template_url_service_unittest.cc
index fb3369b734a628460ae5b5fe7eb7863b28f62dad..1bbd4561f9326815dea9740f5be036edf3d10709 100644
--- a/chrome/browser/search_engines/template_url_service_unittest.cc
+++ b/chrome/browser/search_engines/template_url_service_unittest.cc
@@ -834,7 +834,7 @@ TEST_F(TemplateURLServiceTest, RepairPrepopulatedSearchEngines) {
   // Bing was repaired.
   bing = model()->GetTemplateURLForKeyword(ASCIIToUTF16("bing.com"));
   ASSERT_TRUE(bing);
-  EXPECT_EQ(TemplateURL::NORMAL, bing->GetType());
+  EXPECT_EQ(TemplateURL::NORMAL, bing->type());
 
   // User search engine is preserved.
   EXPECT_EQ(user_dse, model()->GetTemplateURLForHost("www.goo.com"));
@@ -1417,8 +1417,7 @@ TEST_F(TemplateURLServiceTest, DefaultExtensionEngine) {
       std::string(), std::string(), std::string(), true, true, "UTF-8", Time(),
       Time());
   std::unique_ptr<TemplateURL::AssociatedExtensionInfo> extension_info(
-      new TemplateURL::AssociatedExtensionInfo(
-          TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION, "ext"));
+      new TemplateURL::AssociatedExtensionInfo("ext"));
   extension_info->wants_to_be_default_engine = true;
   TemplateURL* ext_dse_ptr = model()->AddExtensionControlledTURL(
       std::move(ext_dse), std::move(extension_info));
@@ -1444,8 +1443,7 @@ TEST_F(TemplateURLServiceTest, ExtensionEnginesNotPersist) {
       std::string(), std::string(), std::string(), true, false, "UTF-8", Time(),
       Time());
   std::unique_ptr<TemplateURL::AssociatedExtensionInfo> extension_info(
-      new TemplateURL::AssociatedExtensionInfo(
-          TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION, "ext1"));
+      new TemplateURL::AssociatedExtensionInfo("ext1"));
   extension_info->wants_to_be_default_engine = false;
   model()->AddExtensionControlledTURL(std::move(ext_dse),
                                       std::move(extension_info));
@@ -1455,8 +1453,7 @@ TEST_F(TemplateURLServiceTest, ExtensionEnginesNotPersist) {
                                   "http://www.ext2.com/s?q={searchTerms}",
                                   std::string(), std::string(), std::string(),
                                   true, true, "UTF-8", Time(), Time());
-  extension_info.reset(new TemplateURL::AssociatedExtensionInfo(
-      TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION, "ext2"));
+  extension_info.reset(new TemplateURL::AssociatedExtensionInfo("ext2"));
   extension_info->wants_to_be_default_engine = true;
   TemplateURL* ext_dse_ptr = model()->AddExtensionControlledTURL(
       std::move(ext_dse), std::move(extension_info));
@@ -1504,8 +1501,7 @@ TEST_F(TemplateURLServiceTest, ExtensionEngineVsPolicy) {
       std::string(), std::string(), std::string(), true, true, "UTF-8", Time(),
       Time());
   std::unique_ptr<TemplateURL::AssociatedExtensionInfo> extension_info(
-      new TemplateURL::AssociatedExtensionInfo(
-          TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION, "ext1"));
+      new TemplateURL::AssociatedExtensionInfo("ext1"));
   extension_info->wants_to_be_default_engine = true;
   TemplateURL* ext_dse_ptr = model()->AddExtensionControlledTURL(
       std::move(ext_dse), std::move(extension_info));