Introduce ability to register callback with GoogleURLTracker

chrome/browser/search_engines/template_url_service.cc

 // 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.
 
 #include "chrome/browser/search_engines/template_url_service.h"
 
 #include <algorithm>
 #include <utility>
 
 #include "base/auto_reset.h"
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/environment.h"
 #include "base/guid.h"
 #include "base/i18n/case_conversion.h"
 #include "base/memory/scoped_vector.h"
 #include "base/metrics/histogram.h"
 #include "base/prefs/pref_service.h"
 #include "base/stl_util.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_split.h"
 #include "base/strings/string_util.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/time/time.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/extensions/extension_service.h"
-#include "chrome/browser/google/google_url_tracker.h"
+#include "chrome/browser/google/google_url_tracker_factory.h"
 #include "chrome/browser/history/history_notifications.h"
 #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/search_terms_data.h"
 #include "chrome/browser/search_engines/template_url.h"
 #include "chrome/browser/search_engines/template_url_prepopulate_data.h"
 #include "chrome/browser/search_engines/template_url_service_observer.h"
@@ skipping 935 matching lines @@
         template_url->GetType() == TemplateURL::OMNIBOX_API_EXTENSION;
     return template_url->AdjustedShortNameForLocaleDirection();
   }
   *is_omnibox_api_extension_keyword = false;
   return base::string16();
 }
 
 void TemplateURLService::Observe(int type,
                                  const content::NotificationSource& source,
                                  const content::NotificationDetails& details) {
-  if (type == chrome::NOTIFICATION_HISTORY_URL_VISITED) {
-    content::Details<history::URLVisitedDetails> visit_details(details);
-    if (!loaded_)
-      visits_to_add_.push_back(*visit_details.ptr());
-    else
-      UpdateKeywordSearchTermsForURL(*visit_details.ptr());
-  } else {
-    DCHECK_EQ(chrome::NOTIFICATION_GOOGLE_URL_UPDATED, type);
-    if (loaded_) {
-      GoogleBaseURLChanged(
-          content::Details<GoogleURLTracker::UpdatedDetails>(details)->first);
-    }
-  }
+  DCHECK_EQ(type, chrome::NOTIFICATION_HISTORY_URL_VISITED);
+  content::Details<history::URLVisitedDetails> visit_details(details);
+  if (!loaded_)
+    visits_to_add_.push_back(*visit_details.ptr());
+  else
+    UpdateKeywordSearchTermsForURL(*visit_details.ptr());
 }
 
 void TemplateURLService::Shutdown() {
   // This check has to be done at Shutdown() instead of in the dtor to ensure
   // that no clients of WebDataService are holding ptrs to it after the first
   // phase of the KeyedService Shutdown() process.
   if (load_handle_) {
     DCHECK(service_.get());
     service_->CancelRequest(load_handle_);
   }
@@ skipping 495 matching lines @@
                               int num_initializers) {
   // Register for notifications.
   if (profile_) {
     // TODO(sky): bug 1166191. The keywords should be moved into the history
     // db, which will mean we no longer need this notification and the history
     // backend can handle automatically adding the search terms as the user
     // navigates.
     content::Source<Profile> profile_source(profile_->GetOriginalProfile());
     notification_registrar_.Add(this, chrome::NOTIFICATION_HISTORY_URL_VISITED,
                                 profile_source);
-    notification_registrar_.Add(this, chrome::NOTIFICATION_GOOGLE_URL_UPDATED,
-                                profile_source);
+    GoogleURLTracker* google_url_tracker =
+        GoogleURLTrackerFactory::GetForProfile(profile_);
+    if (google_url_tracker) {
+      google_url_updated_subscription_ =
+          google_url_tracker->RegisterCallback(base::Bind(
+              &TemplateURLService::OnGoogleURLUpdated, base::Unretained(this)));
+    }
     pref_change_registrar_.Init(GetPrefs());
     pref_change_registrar_.Add(
         prefs::kSyncedDefaultSearchProviderGUID,
         base::Bind(
             &TemplateURLService::OnSyncedDefaultSearchProviderGUIDChanged,
             base::Unretained(this)));
   }
 
   DefaultSearchManager::Source source = DefaultSearchManager::FROM_USER;
   TemplateURLData* dse =
@@ skipping 385 matching lines @@
       // need to reset the keyword to an appropriate local value when this
       // change arrives; see CreateTemplateURLFromTemplateURLAndSyncData().
       UpdateNoNotify(t_url, updated_turl,
           OldBaseURLSearchTermsData(t_url->profile(), old_base_url.spec()));
     }
   }
   if (something_changed)
     NotifyObservers();
 }
 
+void TemplateURLService::OnGoogleURLUpdated(GURL old_url, GURL new_url) {
+  if (loaded_) {

[Peter Kasting, 2014/05/16 22:24:23]

Nit: No {}

+    GoogleBaseURLChanged(old_url);
+  }
+}
+
 void TemplateURLService::OnDefaultSearchChange(
     const TemplateURLData* data,
     DefaultSearchManager::Source source) {
   if (GetPrefs() && (source == DefaultSearchManager::FROM_USER) &&
       ((source != default_search_provider_source_) ||
        !IdenticalSyncGUIDs(data, GetDefaultSearchProvider()))) {
     GetPrefs()->SetString(prefs::kSyncedDefaultSearchProviderGUID,
                           data->sync_guid);
   }
   ApplyDefaultSearchChange(data, source);
@@ skipping 562 matching lines @@
 
   if (most_recently_intalled_default) {
     base::AutoReset<DefaultSearchChangeOrigin> change_origin(
         &dsp_change_origin_, DSP_CHANGE_OVERRIDE_SETTINGS_EXTENSION);
     default_search_manager_.SetExtensionControlledDefaultSearchEngine(
         most_recently_intalled_default->data());
   } else {
     default_search_manager_.ClearExtensionControlledDefaultSearchEngine();
   }
 }