Make extensions DSE persistent in browser prefs

components/search_engines/template_url_service.cc

Index: components/search_engines/template_url_service.cc
diff --git a/components/search_engines/template_url_service.cc b/components/search_engines/template_url_service.cc
index 2b5983b1f5403fdf60637eb3b15bdaaf1ce76786..0bd6ffdb1e82e0a35cd3e169ed4a4196c083d238 100644
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -489,16 +489,29 @@ TemplateURL* TemplateURLService::AddExtensionControlledTURL(
   DCHECK_EQ(kInvalidTemplateURLID, template_url->id());
   DCHECK(info);
   DCHECK_NE(TemplateURL::NORMAL, template_url->type());
-  DCHECK(
-      !FindTemplateURLForExtension(info->extension_id, template_url->type()));
+  // It is possible that extension template url is already created for extension
+  // that is currently overriding default search, before extension itself is
+  // loaded. This is the case when extension overrides DSE in preferences and
+  // extension template url is created when TemplateUrlService changes to loaded
+  // state but before extensions are loaded.
+  TemplateURL* ext_dse =
+      FindTemplateURLForExtension(info->extension_id, template_url->type());
+  if (ext_dse) {
+    DCHECK_EQ(TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION,
+              template_url->type());
+    DCHECK(info->wants_to_be_default_engine);
+    // They must be similar at least.
+    DCHECK_EQ(template_url->data().keyword(), ext_dse->data().keyword());
+    DCHECK_EQ(template_url->data().short_name(), ext_dse->data().short_name());
+    DCHECK_EQ(template_url->data().url(), ext_dse->data().url());
+    return ext_dse;
+  }
+
   template_url->extension_info_.swap(info);
 
   KeywordWebDataService::BatchModeScoper scoper(web_data_service_.get());
   TemplateURL* template_url_ptr = AddNoNotify(std::move(template_url), true);
   if (template_url_ptr) {
-    if (template_url_ptr->extension_info_->wants_to_be_default_engine) {
-      UpdateExtensionDefaultSearchEngine();
-    }
     NotifyObservers();
   }
 
@@ -518,12 +531,10 @@ void TemplateURLService::RemoveExtensionControlledTURL(
   if (!url)
     return;
   // NULL this out so that we can call RemoveNoNotify.
-  // UpdateExtensionDefaultSearchEngine will cause it to be reset.
   if (default_search_provider_ == url)
     default_search_provider_ = nullptr;
   KeywordWebDataService::BatchModeScoper scoper(web_data_service_.get());
   RemoveNoNotify(url);
-  UpdateExtensionDefaultSearchEngine();
   NotifyObservers();
 }
 
@@ -1961,6 +1972,23 @@ bool TemplateURLService::ApplyDefaultSearchChangeNoMetrics(
   } else if (source == DefaultSearchManager::FROM_EXTENSION) {
     default_search_provider_ = FindMatchingExtensionTemplateURL(
         *data, TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION);
+    if (!default_search_provider_) {
+      // This is possible if extension has installed DSE, writing extension
+      // controlled pref and extension service is not yet loaded. Create
+      // extension template url from preference value and add it. Later when
+      // extension will load, it will again register its DSE in template url
+      // service.
+
+      // Get id of extension that controls preference.
+      std::string ext_id = client_->GetExtensionControllingDSEPref();
+      DCHECK(!ext_id.empty());
+      auto ext_turl = base::MakeUnique<TemplateURL>(
+          *data, TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION);
+      ext_turl->extension_info_ =
+          base::MakeUnique<TemplateURL::AssociatedExtensionInfo>(ext_id);
+      ext_turl->extension_info_->wants_to_be_default_engine = true;
+      default_search_provider_ = AddNoNotify(std::move(ext_turl), true);
+    }
   } else if (source == DefaultSearchManager::FROM_FALLBACK) {
     default_search_provider_ =
         FindPrepopulatedTemplateURL(data->prepopulate_id);
@@ -2481,25 +2509,3 @@ TemplateURL* TemplateURLService::FindMatchingExtensionTemplateURL(
   }
   return nullptr;
 }
-
-void TemplateURLService::UpdateExtensionDefaultSearchEngine() {
-  TemplateURL* most_recently_intalled_default = nullptr;
-  for (const auto& turl : template_urls_) {
-    if ((turl->type() == TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION) &&
-        turl->extension_info_->wants_to_be_default_engine &&
-        turl->SupportsReplacement(search_terms_data()) &&
-        (!most_recently_intalled_default ||
-         (most_recently_intalled_default->extension_info_->install_time <
-          turl->extension_info_->install_time)))
-      most_recently_intalled_default = turl.get();
-  }
-
-  if (most_recently_intalled_default) {
-    base::AutoReset<DefaultSearchChangeOrigin> change_origin(
-        &dsp_change_origin_, DSP_CHANGE_OVERRIDE_SETTINGS_EXTENSION);
-    default_search_manager_.SetExtensionControlledDefaultSearchEngine(
-        most_recently_intalled_default->data());
-  } else {
-    default_search_manager_.ClearExtensionControlledDefaultSearchEngine();
-  }
-}