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 0e77d27379f265169564fc3bb4cf7eff964c7a4f..0fea6745f486a7eec42721aaf1c33c924a1df601 100644
--- a/components/search_engines/template_url_service.cc
+++ b/components/search_engines/template_url_service.cc
@@ -452,23 +452,18 @@ TemplateURL* TemplateURLService::AddWithOverrides(
 TemplateURL* TemplateURLService::AddExtensionControlledTURL(
     std::unique_ptr<TemplateURL> template_url,
     std::unique_ptr<TemplateURL::AssociatedExtensionInfo> info) {
-  DCHECK(loaded_);
   DCHECK(template_url);
   DCHECK_EQ(kInvalidTemplateURLID, template_url->id());
   DCHECK(info);
   DCHECK_NE(TemplateURL::NORMAL, template_url->type());
   DCHECK(
       !FindTemplateURLForExtension(info->extension_id, template_url->type()));
+
   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();
-    }
+  if (template_url_ptr)
     NotifyObservers();
-  }
 
   return template_url_ptr;
 }
@@ -486,12 +481,9 @@ 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();
 }
 
@@ -1908,8 +1900,13 @@ bool TemplateURLService::ApplyDefaultSearchChangeNoMetrics(
     // default.
     bool changed = TemplateURL::MatchesData(
         initial_default_search_provider_.get(), data, search_terms_data());
+    TemplateURL::Type initial_engine_type =
+        (source == DefaultSearchManager::FROM_EXTENSION)
+            ? TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION
+            : TemplateURL::NORMAL;
     initial_default_search_provider_ =
-        data ? base::MakeUnique<TemplateURL>(*data) : nullptr;
+        data ? base::MakeUnique<TemplateURL>(*data, initial_engine_type)
+             : nullptr;
     default_search_provider_source_ = source;
     return changed;
   }
@@ -1940,8 +1937,10 @@ bool TemplateURLService::ApplyDefaultSearchChangeNoMetrics(
   if (!data) {
     default_search_provider_ = nullptr;
   } else if (source == DefaultSearchManager::FROM_EXTENSION) {
-    default_search_provider_ = FindMatchingExtensionTemplateURL(
-        *data, TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION);
+    // Extension controlled default TemplateURL must be stored in prefs along
+    // with extension id.
+    default_search_provider_ = GetExtensionControlledDefaultTemplateURL();
+    DCHECK(default_search_provider_);
   } else if (source == DefaultSearchManager::FROM_FALLBACK) {
     default_search_provider_ =
         FindPrepopulatedTemplateURL(data->prepopulate_id);
@@ -1987,7 +1986,6 @@ bool TemplateURLService::ApplyDefaultSearchChangeNoMetrics(
       prefs_->SetString(prefs::kSyncedDefaultSearchProviderGUID,
                         default_search_provider_->sync_guid());
     }
-
   }
 
   default_search_provider_source_ = source;
@@ -2451,36 +2449,15 @@ TemplateURL* TemplateURLService::FindTemplateURLForExtension(
   return nullptr;
 }
 
-TemplateURL* TemplateURLService::FindMatchingExtensionTemplateURL(
-    const TemplateURLData& data,
-    TemplateURL::Type type) {
-  DCHECK_NE(TemplateURL::NORMAL, type);
-  for (const auto& turl : template_urls_) {
-    if (turl->type() == type &&
-        TemplateURL::MatchesData(turl.get(), &data, search_terms_data()))
-      return turl.get();
+TemplateURL* TemplateURLService::GetExtensionControlledDefaultTemplateURL() {
+  const base::DictionaryValue* data_dict = prefs_->GetDictionary(
+      DefaultSearchManager::kDefaultSearchProviderDataPrefName);
+  std::string extension_id;
+  if (data_dict &&
+      data_dict->GetString(DefaultSearchManager::kExtensionID, &extension_id)) {
+    DCHECK(!extension_id.empty());
+    return FindTemplateURLForExtension(
+        extension_id, TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION);
   }
   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();
-  }
-}