Make extensions DSE persistent in browser prefs (Reland)

components/search_engines/template_url_service.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 "components/search_engines/template_url_service.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/auto_reset.h"
@@ skipping 434 matching lines @@
   DCHECK(!url.empty());
   template_url->data_.SetShortName(short_name);
   template_url->data_.SetKeyword(keyword);
   template_url->SetURL(url);
   return Add(std::move(template_url));
 }
 
 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;

[Peter Kasting, 2017/02/28 00:56:37]

Collapse these four lines into "return Add(...);".

I wonder if this method shouldn't entirely disappear and be replaced by some
kind of TemplateURL constructor that takes an AssociatedExtensionInfo pointer or
something.

[Alexander Yashkin, 2017/02/28 11:59:56]

Collapse done.  Good idea for refactoring, will do in separate CL.

 }
 
 void TemplateURLService::Remove(TemplateURL* template_url) {
   RemoveNoNotify(template_url);
   NotifyObservers();
 }
 
 void TemplateURLService::RemoveExtensionControlledTURL(
     const std::string& extension_id,
     TemplateURL::Type type) {
-  DCHECK(loaded_);
   TemplateURL* url = FindTemplateURLForExtension(extension_id, type);
   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();

[Peter Kasting, 2017/02/28 00:56:37]

Nit: Collapse these two lines to a call to Remove().

[Alexander Yashkin, 2017/02/28 11:59:56]

Done.

 }
 
 void TemplateURLService::RemoveAutoGeneratedSince(base::Time created_after) {
   RemoveAutoGeneratedBetween(created_after, base::Time());
 }
 
 void TemplateURLService::RemoveAutoGeneratedBetween(base::Time created_after,
                                                     base::Time created_before) {
   RemoveAutoGeneratedForUrlsBetween(base::Callback<bool(const GURL&)>(),
                                     created_after, created_before);
@@ skipping 1427 matching lines @@
 bool TemplateURLService::ApplyDefaultSearchChangeNoMetrics(
     const TemplateURLData* data,
     DefaultSearchManager::Source source) {
   if (!loaded_) {
     // Set |initial_default_search_provider_| from the preferences. This is
     // mainly so we can hold ownership until we get to the point where the list
     // of keywords from Web Data is the owner of everything including the
     // 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;
   }
 
   // Prevent recursion if we update the value stored in default_search_manager_.
   // Note that we exclude the case of data == NULL because that could cause a
   // false positive for recursion when the initial_default_search_provider_ is
   // NULL due to policy. We'll never actually get recursion with data == NULL.
   if (source == default_search_provider_source_ && data != nullptr &&
       TemplateURL::MatchesData(default_search_provider_, data,
@@ skipping 16 matching lines @@
 
   // |default_search_provider_source_| must be set before calling
   // UpdateNoNotify(), since that function needs to know the source of the
   // update in question.
   default_search_provider_source_ = source;
 
   if (!data) {
     default_search_provider_ = nullptr;
   } else if (source == DefaultSearchManager::FROM_EXTENSION) {
     default_search_provider_ = FindMatchingDefaultExtensionTemplateURL(*data);
+    DCHECK(default_search_provider_);
   } else if (source == DefaultSearchManager::FROM_FALLBACK) {
     default_search_provider_ =
         FindPrepopulatedTemplateURL(data->prepopulate_id);
     if (default_search_provider_) {
       TemplateURLData update_data(*data);
       update_data.sync_guid = default_search_provider_->sync_guid();
       if (!default_search_provider_->safe_for_autoreplace()) {
         update_data.safe_for_autoreplace = false;
         update_data.SetKeyword(default_search_provider_->keyword());
         update_data.SetShortName(default_search_provider_->short_name());
@@ skipping 489 matching lines @@
 TemplateURL* TemplateURLService::FindMatchingDefaultExtensionTemplateURL(
     const TemplateURLData& data) {
   for (const auto& turl : template_urls_) {
     if (turl->type() == TemplateURL::NORMAL_CONTROLLED_BY_EXTENSION &&
         turl->extension_info_->wants_to_be_default_engine &&
         TemplateURL::MatchesData(turl.get(), &data, search_terms_data()))
       return turl.get();
   }
   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();
-  }
-}