commit 82fe07e9bbaba83a60ee1e6ec9d4171683cf06c1
author hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Jul 02 07:40:22 2014
committer hashimoto@chromium.org <hashimoto@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> Wed Jul 02 07:40:22 2014
tree 9a2bc7952db14e81fa930d9fbb209eaf5182a443
parent bfac39806dddb41c348d7565aa581a37612de2e6

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

TemplateURLServiceFactory is responsible to inject a Closure.

BUG=381572
TEST=build a RLZ enabled binary
TBR=battre@chromium.org for profile_resetter_unittest.cc

Review URL: https://codereview.chromium.org/366523002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@280974 0039d316-1c4b-4281-b951-d872f2087c98

chrome/browser/search_engines/template_url_service.cc

diff --git a/chrome/browser/search_engines/template_url_service.cc b/chrome/browser/search_engines/template_url_service.cc
index 47967e9..a691ed5 100644
--- a/chrome/browser/search_engines/template_url_service.cc
+++ b/chrome/browser/search_engines/template_url_service.cc
@@ -26,7 +26,6 @@
 #include "chrome/browser/history/history_service.h"
 #include "chrome/browser/history/history_service_factory.h"
 #include "chrome/browser/profiles/profile.h"
-#include "chrome/browser/rlz/rlz.h"
 #include "chrome/browser/search_engines/search_host_to_urls_map.h"
 #include "chrome/browser/search_engines/template_url_service_observer.h"
 #include "chrome/browser/search_engines/ui_thread_search_terms_data.h"
@@ -187,12 +186,14 @@
 // TemplateURLService ---------------------------------------------------------
 
 TemplateURLService::TemplateURLService(Profile* profile,
-                                       rappor::RapporService* rappor_service)
+                                       rappor::RapporService* rappor_service,
+                                       const base::Closure& dsp_change_callback)
     : provider_map_(new SearchHostToURLsMap),
       profile_(profile),
       prefs_(profile ? profile->GetPrefs() : NULL),
       rappor_service_(rappor_service),
       search_terms_data_(new UIThreadSearchTermsData(profile)),
+      dsp_change_callback_(dsp_change_callback),
       loaded_(false),
       load_failed_(false),
       load_handle_(0),
@@ -1863,12 +1864,9 @@
       "Search.DefaultSearchChangeOrigin", dsp_change_origin_, DSP_CHANGE_MAX);
 
   if (GetDefaultSearchProvider() &&
-      GetDefaultSearchProvider()->HasGoogleBaseURLs(search_terms_data())) {
-#if defined(ENABLE_RLZ)
-    RLZTracker::RecordProductEvent(
-        rlz_lib::CHROME, RLZTracker::ChromeOmnibox(), rlz_lib::SET_TO_GOOGLE);
-#endif
-  }
+      GetDefaultSearchProvider()->HasGoogleBaseURLs(search_terms_data()) &&
+      !dsp_change_callback_.is_null())
+    dsp_change_callback_.Run();
 }
 
 bool TemplateURLService::ApplyDefaultSearchChangeNoMetrics(