Revert of Revert of Elimate NOTIFICATION_GOOGLE_URL_UPDATED

chrome/browser/ui/navigation_correction_tab_observer.h

Index: chrome/browser/ui/navigation_correction_tab_observer.h
diff --git a/chrome/browser/ui/navigation_correction_tab_observer.h b/chrome/browser/ui/navigation_correction_tab_observer.h
index 795afa6ed452991bc326430e6a9714ed69d68a5a..f3cb64d4a32cbb28a854c776dde9cacf1e5efe67 100644
--- a/chrome/browser/ui/navigation_correction_tab_observer.h
+++ b/chrome/browser/ui/navigation_correction_tab_observer.h
@@ -6,8 +6,7 @@
 #define CHROME_BROWSER_UI_NAVIGATION_CORRECTION_TAB_OBSERVER_H_
 
 #include "base/prefs/pref_change_registrar.h"
-#include "content/public/browser/notification_observer.h"
-#include "content/public/browser/notification_registrar.h"
+#include "chrome/browser/google/google_url_tracker.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/browser/web_contents_user_data.h"
 
@@ -20,7 +19,6 @@
 // Per-tab class to implement navigation suggestion service functionality.
 class NavigationCorrectionTabObserver
     : public content::WebContentsObserver,
-      public content::NotificationObserver,
       public content::WebContentsUserData<NavigationCorrectionTabObserver> {
  public:
   virtual ~NavigationCorrectionTabObserver();
@@ -35,12 +33,10 @@
   virtual void RenderViewCreated(
       content::RenderViewHost* render_view_host) OVERRIDE;
 
-  // content::NotificationObserver overrides:
-  virtual void Observe(int type,
-                       const content::NotificationSource& source,
-                       const content::NotificationDetails& details) OVERRIDE;
+  // Internal helpers ----------------------------------------------------------
 
-  // Internal helpers ----------------------------------------------------------
+  // Callback that is called when the Google URL is updated.
+  void OnGoogleURLUpdated(GURL old_url, GURL new_url);
 
   // Returns the URL for the correction service.  If the returned URL
   // is empty, the default error pages will be used.
@@ -53,8 +49,8 @@
   void UpdateNavigationCorrectionInfo(content::RenderViewHost* rvh);
 
   Profile* profile_;
-  content::NotificationRegistrar registrar_;
   PrefChangeRegistrar pref_change_registrar_;
+  scoped_ptr<GoogleURLTracker::Subscription> google_url_updated_subscription_;
 
   DISALLOW_COPY_AND_ASSIGN(NavigationCorrectionTabObserver);
 };