Eliminate dependence of GoogleURLTracker et al. on InfoBarService

chrome/browser/google/google_url_tracker_infobar_delegate.h

Index: chrome/browser/google/google_url_tracker_infobar_delegate.h
diff --git a/chrome/browser/google/google_url_tracker_infobar_delegate.h b/chrome/browser/google/google_url_tracker_infobar_delegate.h
index 1b7fa2fd0937deb2c3bcd85303afc3c825a43bf5..f40710e931d48da76223bdc16fd6c4e9cebc473d 100644
--- a/chrome/browser/google/google_url_tracker_infobar_delegate.h
+++ b/chrome/browser/google/google_url_tracker_infobar_delegate.h
@@ -9,17 +9,23 @@
 #include "url/gurl.h"
 
 class GoogleURLTracker;
-class InfoBarService;
+class GoogleURLTrackerNavigationHelper;
+
+namespace infobars {
+class InfoBarManager;
+}
 
 // This infobar is shown by the GoogleURLTracker when the Google base URL has
 // changed.
 class GoogleURLTrackerInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
   // Creates a Google URL tracker infobar and delegate and adds the infobar to
-  // |infobar_service|.  Returns the infobar if it was successfully added.
-  static infobars::InfoBar* Create(InfoBarService* infobar_service,
-                                   GoogleURLTracker* google_url_tracker,
-                                   const GURL& search_url);
+  // |infobar_manager|.  Returns the infobar if it was successfully added.
+  static infobars::InfoBar* Create(
+      infobars::InfoBarManager* infobar_manager,
+      GoogleURLTracker* google_url_tracker,
+      GoogleURLTrackerNavigationHelper* navigation_helper,
+      const GURL& search_url);
 
   // ConfirmInfoBarDelegate:
   virtual bool Accept() OVERRIDE;
@@ -36,8 +42,10 @@ class GoogleURLTrackerInfoBarDelegate : public ConfirmInfoBarDelegate {
   virtual void Close(bool redo_search);
 
  protected:
-  GoogleURLTrackerInfoBarDelegate(GoogleURLTracker* google_url_tracker,
-                                  const GURL& search_url);
+  GoogleURLTrackerInfoBarDelegate(
+      GoogleURLTracker* google_url_tracker,
+      GoogleURLTrackerNavigationHelper* navigation_helper,
+      const GURL& search_url);
   virtual ~GoogleURLTrackerInfoBarDelegate();
 
  private:
@@ -50,6 +58,7 @@ class GoogleURLTrackerInfoBarDelegate : public ConfirmInfoBarDelegate {
       const NavigationDetails& details) const OVERRIDE;
 
   GoogleURLTracker* google_url_tracker_;
+  GoogleURLTrackerNavigationHelper* navigation_helper_;
   GURL search_url_;
   int pending_id_;