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

chrome/browser/search_engines/template_url_service.h

Index: chrome/browser/search_engines/template_url_service.h
diff --git a/chrome/browser/search_engines/template_url_service.h b/chrome/browser/search_engines/template_url_service.h
index 663ebfc151271b1c2c976b67b1b8392ad0f52278..41cd5b377331b41765905ae79c6ca69ceb896475 100644
--- a/chrome/browser/search_engines/template_url_service.h
+++ b/chrome/browser/search_engines/template_url_service.h
@@ -346,6 +346,12 @@ class TemplateURLService : public WebDataServiceConsumer,
     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(
@@ -681,6 +687,9 @@ class TemplateURLService : public WebDataServiceConsumer,
 
   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_;