Stop depending on chrome/browser/rlz/rlz.h from TemplateURLService

chrome/browser/search_engines/template_url_service.h

 // Copyright (c) 2012 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 CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_
 #define CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_
 
 #include <list>
 #include <map>
 #include <set>
@@ skipping 328 matching lines @@
   Profile* profile() const { return profile_; }
 
   // Returns a SearchTermsData which can be used to call TemplateURL methods.
   // Note: Prefer using this method to instantiating UIThreadSearchTermsData on
   // your own, especially when your code hasn't depended on Profile, to avoid
   // adding a new dependency on Profile.
   const SearchTermsData& search_terms_data() const {
     return *search_terms_data_;
   }
 
+  void set_dsp_changed_to_google_event_recorder(
+      const base::Closure& dsp_changed_to_google_event_recorder) {
+    dsp_changed_to_google_event_recorder_ =
+        dsp_changed_to_google_event_recorder;
+  }
+
   // Returns a SyncData with a sync representation of the search engine data
   // from |turl|.
   static syncer::SyncData CreateSyncDataFromTemplateURL(
       const TemplateURL& turl);
 
   // Creates a new heap-allocated TemplateURL* which is populated by overlaying
   // |sync_data| atop |existing_turl|.  |existing_turl| may be NULL; if not it
   // remains unmodified.  The caller owns the returned TemplateURL*.
   //
   // If the created TemplateURL is migrated in some way from out-of-date sync
@@ skipping 315 matching lines @@
   // When Load is invoked, if we haven't yet loaded, the WebDataService is
   // obtained from the Profile. This allows us to lazily access the database.
   Profile* profile_;
 
   PrefService* prefs_;
 
   rappor::RapporService* rappor_service_;
 
   scoped_ptr<SearchTermsData> search_terms_data_;
 
+  // This closure is run when the default search provider is set to google.
+  base::Closure dsp_changed_to_google_event_recorder_;

[Peter Kasting, 2014/07/01 18:19:08]

Let's just call this |dsp_change_callback_| and rely on comments to make it
clear that it's only called on changing the DSP to Google.  That makes the name
a bit more comprehensible.

[hashimoto, 2014/07/01 23:24:49]

Done.

+
   // Whether the keywords have been loaded.
   bool loaded_;
 
   // Set when the web data service fails to load properly.  This prevents
   // further communication with sync or writing to prefs, so we don't persist
   // inconsistent state data anywhere.
   bool load_failed_;
 
   // If non-zero, we're waiting on a load.
   WebDataService::Handle load_handle_;
@@ skipping 55 matching lines @@
 
   // Helper class to manage the default search engine.
   DefaultSearchManager default_search_manager_;
 
   scoped_ptr<GoogleURLTracker::Subscription> google_url_updated_subscription_;
 
   DISALLOW_COPY_AND_ASSIGN(TemplateURLService);
 };
 
 #endif  // CHROME_BROWSER_SEARCH_ENGINES_TEMPLATE_URL_SERVICE_H_