Fix TemplateUrl::MatchesData comparison of search_terms_replacement_key (reland)

components/search_engines/default_search_manager.h

Index: components/search_engines/default_search_manager.h
diff --git a/components/search_engines/default_search_manager.h b/components/search_engines/default_search_manager.h
index aadc6a4648952a740881931ea7ac2c7fed629882..406b20963098682bd9476821d9d5dddd7ca54806 100644
--- a/components/search_engines/default_search_manager.h
+++ b/components/search_engines/default_search_manager.h
@@ -63,9 +63,15 @@ class DefaultSearchManager {
   static const char kDisabledByPolicy[];
 
   enum Source {
+    // Default search engine chosen either from prepopulated engines set for
+    // current country or overriden from kSearchProviderOverrides preference.
     FROM_FALLBACK = 0,
+    // User selected engine.
     FROM_USER,
+    // Search engine set by extension overriding default search.
     FROM_EXTENSION,
+    // Search engine controlled externally through enterprise configuration
+    // management (e.g. windows group policy).
     FROM_POLICY,
   };
 
@@ -96,6 +102,9 @@ class DefaultSearchManager {
   // Gets the source of the current Default Search Engine value.
   Source GetDefaultSearchEngineSource() const;
 
+  // Returns a pointer to fallback engine.

[vasilii, 2017/02/13 14:37:54]

the fallback engine

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

Done

+  TemplateURLData* GetFallbackSearchEngine() const;

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

Nit: const methods should not return non-const pointers; either return a
pointer-to-const, or make the method non-const.

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

Done

+
   // Write default search provider data to |pref_service_|.
   void SetUserSelectedDefaultSearchEngine(const TemplateURLData& data);