Revert of Revert of Elimate NOTIFICATION_GOOGLE_URL_UPDATED

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 84 matching lines @@
 }
 
 // static
 void GoogleURLTracker::GoogleURLSearchCommitted(Profile* profile) {
   GoogleURLTracker* tracker = GoogleURLTrackerFactory::GetForProfile(profile);
   if (tracker)
     tracker->SearchCommitted();
 }
 
 void GoogleURLTracker::AcceptGoogleURL(bool redo_searches) {
-  UpdatedDetails urls(google_url_, fetched_google_url_);
+  GURL old_google_url = 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);
+  NotifyGoogleURLUpdated(old_google_url, google_url_);
 
-  // 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,
                                   fetched_google_url_.spec());
   need_to_prompt_ = false;
   CloseAllEntries(false);
 }
@@ skipping 299 matching lines @@
   }
   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);
 }