Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/google/google_url_tracker_infobar_delegate.h

Index: trunk/src/chrome/browser/google/google_url_tracker_infobar_delegate.h
===================================================================
--- trunk/src/chrome/browser/google/google_url_tracker_infobar_delegate.h	(revision 238401)
+++ trunk/src/chrome/browser/google/google_url_tracker_infobar_delegate.h	(working copy)
@@ -14,11 +14,12 @@
 // 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 InfoBar* Create(InfoBarService* infobar_service,
-                         GoogleURLTracker* google_url_tracker,
-                         const GURL& search_url);
+  // Creates a Google URL tracker infobar delegate and adds it to
+  // |infobar_service|.  Returns the delegate if it was successfully added.
+  static GoogleURLTrackerInfoBarDelegate* Create(
+      InfoBarService* infobar_service,
+      GoogleURLTracker* google_url_tracker,
+      const GURL& search_url);
 
   // ConfirmInfoBarDelegate:
   virtual bool Accept() OVERRIDE;
@@ -35,7 +36,8 @@
   virtual void Close(bool redo_search);
 
  protected:
-  GoogleURLTrackerInfoBarDelegate(GoogleURLTracker* google_url_tracker,
+  GoogleURLTrackerInfoBarDelegate(InfoBarService* infobar_service,
+                                  GoogleURLTracker* google_url_tracker,
                                   const GURL& search_url);
   virtual ~GoogleURLTrackerInfoBarDelegate();