Introduce ability to register callback with GoogleURLTracker

chrome/browser/google/google_url_tracker.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/google/google_url_tracker.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/prefs/pref_service.h"
 #include "base/strings/string_util.h"
@@ skipping 89 matching lines @@
   if (tracker)
     tracker->SearchCommitted();
 }
 
 void GoogleURLTracker::AcceptGoogleURL(bool redo_searches) {
   UpdatedDetails urls(google_url_, fetched_google_url_);
   google_url_ = fetched_google_url_;
   PrefService* prefs = profile_->GetPrefs();
   prefs->SetString(prefs::kLastKnownGoogleURL, google_url_.spec());
   prefs->SetString(prefs::kLastPromptedGoogleURL, google_url_.spec());
+  NotifyGoogleURLUpdated(urls.first, urls.second);
+
+  // TODO(blundell): Convert all clients to use the callback interface and
+  // eliminate this notification. crbug.com/373237
   content::NotificationService::current()->Notify(
       chrome::NOTIFICATION_GOOGLE_URL_UPDATED,
       content::Source<Profile>(profile_),
       content::Details<UpdatedDetails>(&urls));
   need_to_prompt_ = false;
   CloseAllEntries(redo_searches);
 }
 
 void GoogleURLTracker::CancelGoogleURL() {
   profile_->GetPrefs()->SetString(prefs::kLastPromptedGoogleURL,
@@ skipping 247 matching lines @@
   // here might (and have comments pointing back here).
   for (EntryMap::iterator i(entry_map_.begin()); i != entry_map_.end(); ++i) {
     if (i->second->navigation_controller() == navigation_controller) {
       i->second->Close(false);
       return;
     }
   }
   NOTREACHED();
 }
 
+scoped_ptr<GoogleURLTracker::Subscription> GoogleURLTracker::RegisterCallback(
+    const OnGoogleURLUpdatedCallback& cb) {
+  return callback_list_.Add(cb);
+}
+
 void GoogleURLTracker::CloseAllEntries(bool redo_searches) {
   // Delete all entries, whether they have infobars or not.
   while (!entry_map_.empty())
     entry_map_.begin()->second->Close(redo_searches);
 }
 
 void GoogleURLTracker::UnregisterForEntrySpecificNotifications(
     const GoogleURLTrackerMapEntry& map_entry,
     bool must_be_listening_for_commit) {
   // For tabs with map entries but no infobars, we should always be listening
@@ skipping 27 matching lines @@
             i->second->navigation_controller())) {
       DCHECK(nav_helper_->IsListeningForNavigationStart());
       return;
     }
   }
   if (nav_helper_->IsListeningForNavigationStart()) {
     DCHECK(!search_committed_);
     nav_helper_->SetListeningForNavigationStart(false);
   }
 }
+
+void GoogleURLTracker::NotifyGoogleURLUpdated(GURL old_url, GURL new_url) {
+  callback_list_.Notify(old_url, new_url);
+}