Revert of Turn GoogleURLTrackerNavigationHelper(Impl) into a per-tab object.

chrome/browser/google/google_url_tracker_navigation_helper_impl.h

Index: chrome/browser/google/google_url_tracker_navigation_helper_impl.h
diff --git a/chrome/browser/google/google_url_tracker_navigation_helper_impl.h b/chrome/browser/google/google_url_tracker_navigation_helper_impl.h
index 1d81e543ddc8d615630a7e217a5009c903f41b5b..b024744df9613b7b79a4307cb1703dad165b5692 100644
--- a/chrome/browser/google/google_url_tracker_navigation_helper_impl.h
+++ b/chrome/browser/google/google_url_tracker_navigation_helper_impl.h
@@ -10,25 +10,25 @@
 #include "content/public/browser/notification_registrar.h"
 #include "url/gurl.h"
 
-namespace content {
-class WebContents;
-}
-
 class GoogleURLTrackerNavigationHelperImpl
     : public GoogleURLTrackerNavigationHelper,
       public content::NotificationObserver {
  public:
-  GoogleURLTrackerNavigationHelperImpl(content::WebContents* web_contents,
-                                       GoogleURLTracker* tracker);
+  explicit GoogleURLTrackerNavigationHelperImpl();
   virtual ~GoogleURLTrackerNavigationHelperImpl();
 
-  // GoogleURLTrackerNavigationHelper:
+  // GoogleURLTrackerNavigationHelper.
+  virtual void SetGoogleURLTracker(GoogleURLTracker* tracker) OVERRIDE;
   virtual void SetListeningForNavigationCommit(
+      const content::NavigationController* nav_controller,
       bool listen) OVERRIDE;
-  virtual bool IsListeningForNavigationCommit() OVERRIDE;
+  virtual bool IsListeningForNavigationCommit(
+      const content::NavigationController* nav_controller) OVERRIDE;
   virtual void SetListeningForTabDestruction(
+      const content::NavigationController* nav_controller,
       bool listen) OVERRIDE;
-  virtual bool IsListeningForTabDestruction() OVERRIDE;
+  virtual bool IsListeningForTabDestruction(
+      const content::NavigationController* nav_controller) OVERRIDE;
 
  private:
   // content::NotificationObserver:
@@ -36,10 +36,13 @@
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
-  content::WebContents* web_contents_;
+  // Returns a WebContents NavigationSource for the WebContents corresponding to
+  // the given NavigationController NotificationSource.
+  virtual content::NotificationSource GetWebContentsSource(
+      const content::NotificationSource& nav_controller_source);
+
+  GoogleURLTracker* tracker_;
   content::NotificationRegistrar registrar_;
-
-  DISALLOW_COPY_AND_ASSIGN(GoogleURLTrackerNavigationHelperImpl);
 };
 
 #endif  // CHROME_BROWSER_GOOGLE_GOOGLE_URL_TRACKER_NAVIGATION_HELPER_IMPL_H_