Fix TemplateUrl::MatchesData comparison of search_terms_replacement_key (reland)

components/search_engines/default_search_manager.cc

Index: components/search_engines/default_search_manager.cc
diff --git a/components/search_engines/default_search_manager.cc b/components/search_engines/default_search_manager.cc
index 869ce645584678fc8142ca9131890994430289cc..e1f204ccd2a3ecf9389566c7c0ea3275096845e5 100644
--- a/components/search_engines/default_search_manager.cc
+++ b/components/search_engines/default_search_manager.cc
@@ -143,8 +143,8 @@ TemplateURLData* DefaultSearchManager::GetDefaultSearchEngine(
 
   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
@@ -154,6 +154,10 @@ DefaultSearchManager::GetDefaultSearchEngineSource() const {
   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_) {