Fix TemplateUrl::MatchesData comparison of search_terms_replacement_key (reland)

components/search_engines/default_search_manager.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/default_search_manager.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <algorithm>
@@ skipping 105 matching lines @@
   pref_value_map->SetValue(kDefaultSearchProviderDataPrefName,
                            std::move(value));
 }
 
 // static
 void DefaultSearchManager::SetFallbackSearchEnginesDisabledForTesting(
     bool disabled) {
   g_fallback_search_engines_disabled = disabled;
 }
 
-TemplateURLData* DefaultSearchManager::GetDefaultSearchEngine(
+const TemplateURLData* DefaultSearchManager::GetDefaultSearchEngine(
     Source* source) const {
   if (default_search_controlled_by_policy_) {
     if (source)
       *source = FROM_POLICY;
     return prefs_default_search_.get();
   }
   if (extension_default_search_) {
     if (source)
       *source = FROM_EXTENSION;
     return extension_default_search_.get();
   }
   if (prefs_default_search_) {
     if (source)
       *source = FROM_USER;
     return prefs_default_search_.get();
   }
 
   if (source)
     *source = FROM_FALLBACK;
-  return g_fallback_search_engines_disabled ?
-      NULL : fallback_default_search_.get();
+  return GetFallbackSearchEngine();
 }
 
 DefaultSearchManager::Source
 DefaultSearchManager::GetDefaultSearchEngineSource() const {
   Source source;
   GetDefaultSearchEngine(&source);
   return source;
 }
 
+const TemplateURLData* DefaultSearchManager::GetFallbackSearchEngine() const {
+  return g_fallback_search_engines_disabled ? nullptr
+                                            : fallback_default_search_.get();
+}
+
 void DefaultSearchManager::SetUserSelectedDefaultSearchEngine(
     const TemplateURLData& data) {
   if (!pref_service_) {
     prefs_default_search_.reset(new TemplateURLData(data));
     MergePrefsDataWithPrepopulated();
     NotifyObserver();
     return;
   }
 
   pref_service_->Set(kDefaultSearchProviderDataPrefName,
@@ skipping 30 matching lines @@
   // If we were/are FROM_USER or FROM_POLICY the effective DSE may have changed.
   if (source != FROM_USER && source != FROM_POLICY)
     source = GetDefaultSearchEngineSource();
   if (source == FROM_USER || source == FROM_POLICY)
     NotifyObserver();
 }
 
 void DefaultSearchManager::OnOverridesPrefChanged() {
   LoadPrepopulatedDefaultSearch();
 
-  TemplateURLData* effective_data = GetDefaultSearchEngine(NULL);
+  const TemplateURLData* effective_data = GetDefaultSearchEngine(nullptr);
   if (effective_data && effective_data->prepopulate_id) {
     // A user-selected, policy-selected or fallback pre-populated engine is
     // active and may have changed with this event.
     NotifyObserver();
   }
 }
 
 void DefaultSearchManager::MergePrefsDataWithPrepopulated() {
   if (!prefs_default_search_ || !prefs_default_search_->prepopulate_id)
     return;
@@ skipping 55 matching lines @@
 void DefaultSearchManager::LoadPrepopulatedDefaultSearch() {
   std::unique_ptr<TemplateURLData> data =
       TemplateURLPrepopulateData::GetPrepopulatedDefaultSearch(pref_service_);
   fallback_default_search_ = std::move(data);
   MergePrefsDataWithPrepopulated();
 }
 
 void DefaultSearchManager::NotifyObserver() {
   if (!change_observer_.is_null()) {
     Source source = FROM_FALLBACK;
-    TemplateURLData* data = GetDefaultSearchEngine(&source);
+    const TemplateURLData* data = GetDefaultSearchEngine(&source);
     change_observer_.Run(data, source);
   }
 }