Fix TemplateUrl::MatchesData comparison of search_terms_replacement_key (reland)

components/search_engines/default_search_manager.h

 // 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.
 
 #ifndef COMPONENTS_SEARCH_ENGINES_DEFAULT_SEARCH_MANAGER_H_
 #define COMPONENTS_SEARCH_ENGINES_DEFAULT_SEARCH_MANAGER_H_
 
 #include <memory>
 
 #include "base/callback.h"
@@ skipping 45 matching lines @@
   static const char kLastModified[];
   static const char kLastVisited[];
 
   static const char kUsageCount[];
   static const char kAlternateURLs[];
   static const char kSearchTermsReplacementKey[];
   static const char kCreatedByPolicy[];
   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,
   };
 
   typedef base::Callback<void(const TemplateURLData*, Source)> ObserverCallback;
 
   DefaultSearchManager(PrefService* pref_service,
                        const ObserverCallback& change_observer);
 
   ~DefaultSearchManager();
 
   // Register prefs needed for tracking the default search provider.
   static void RegisterProfilePrefs(user_prefs::PrefRegistrySyncable* registry);
 
   // Save default search provider pref values into the map provided.
   static void AddPrefValueToMap(std::unique_ptr<base::DictionaryValue> value,
                                 PrefValueMap* pref_value_map);
 
   // Testing code can call this with |disabled| set to true to cause
-  // GetDefaultSearchEngine() to return NULL instead of
+  // GetDefaultSearchEngine() to return nullptr instead of
   // |fallback_default_search_| in cases where the DSE source is FROM_FALLBACK.
   static void SetFallbackSearchEnginesDisabledForTesting(bool disabled);
 
   // Gets a pointer to the current Default Search Engine. If NULL, indicates
   // that Default Search is explicitly disabled. |source|, if not NULL, will be
   // filled in with the source of the result.
-  TemplateURLData* GetDefaultSearchEngine(Source* source) const;
+  const TemplateURLData* GetDefaultSearchEngine(Source* source) const;
 
   // Gets the source of the current Default Search Engine value.
   Source GetDefaultSearchEngineSource() const;
 
+  // Returns a pointer to the fallback engine.
+  const TemplateURLData* GetFallbackSearchEngine() const;
+
   // Write default search provider data to |pref_service_|.
   void SetUserSelectedDefaultSearchEngine(const TemplateURLData& data);
 
   // Override the default search provider with an extension.
   void SetExtensionControlledDefaultSearchEngine(const TemplateURLData& data);
 
   // Clear the extension-provided default search engine. Does not explicitly
   // disable Default Search. The new current default search engine will be
   // defined by policy, extensions, or pre-populated data.
   void ClearExtensionControlledDefaultSearchEngine();
@@ skipping 49 matching lines @@
   // prefs). This will be null if no value was set in the pref store.
   std::unique_ptr<TemplateURLData> prefs_default_search_;
 
   // True if the default search is currently enforced by policy.
   bool default_search_controlled_by_policy_;
 
   DISALLOW_COPY_AND_ASSIGN(DefaultSearchManager);
 };
 
 #endif  // COMPONENTS_SEARCH_ENGINES_DEFAULT_SEARCH_MANAGER_H_