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 125 matching lines @@
     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 g_fallback_search_engines_disabled ? nullptr
+                                            : fallback_default_search_.get();
 }
 
 DefaultSearchManager::Source
 DefaultSearchManager::GetDefaultSearchEngineSource() const {
   Source source;
   GetDefaultSearchEngine(&source);
   return source;
 }
 
+TemplateURLData* DefaultSearchManager::GetFallbackSearchEngine() const {
+  return fallback_default_search_.get();

[Peter Kasting, 2017/02/13 22:24:57]

Shouldn't this check |g_fallback_search_engines_disabled|?  (Then
GetDefaultSearchEngine() could call this.)

I don't think this will make a practical difference since that variable is only
set by tests, and no tests should set it and also exercise the new code you're
adding in RepairPrepopulatedSearchEngines(), but it seems more correct.

[Alexander Yashkin, 2017/02/14 12:04:43]

Done

+}
+
 void DefaultSearchManager::SetUserSelectedDefaultSearchEngine(
     const TemplateURLData& data) {
   if (!pref_service_) {
     prefs_default_search_.reset(new TemplateURLData(data));
     MergePrefsDataWithPrepopulated();
     NotifyObserver();
     return;
   }
 
   pref_service_->Set(kDefaultSearchProviderDataPrefName,
@@ skipping 110 matching lines @@
   MergePrefsDataWithPrepopulated();
 }
 
 void DefaultSearchManager::NotifyObserver() {
   if (!change_observer_.is_null()) {
     Source source = FROM_FALLBACK;
     TemplateURLData* data = GetDefaultSearchEngine(&source);
     change_observer_.Run(data, source);
   }
 }