Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/geolocation/geolocation_infobar_delegate.h

Index: trunk/src/chrome/browser/geolocation/geolocation_infobar_delegate.h
===================================================================
--- trunk/src/chrome/browser/geolocation/geolocation_infobar_delegate.h	(revision 238401)
+++ trunk/src/chrome/browser/geolocation/geolocation_infobar_delegate.h	(working copy)
@@ -19,16 +19,17 @@
 // and handling of geolocation permission infobars to the user.
 class GeolocationInfoBarDelegate : public ConfirmInfoBarDelegate {
  public:
-  // Creates a geolocation infobar and delegate and adds the infobar to
-  // |infobar_service|.  Returns the infobar if it was successfully added.
-  static InfoBar* Create(InfoBarService* infobar_service,
-                         PermissionQueueController* controller,
-                         const PermissionRequestID& id,
-                         const GURL& requesting_frame,
-                         const std::string& display_languages);
+  // Creates a geolocation infobar delegate and adds it to |infobar_service|.
+  // Returns the delegate if it was successfully added.
+  static InfoBarDelegate* Create(InfoBarService* infobar_service,
+                                 PermissionQueueController* controller,
+                                 const PermissionRequestID& id,
+                                 const GURL& requesting_frame,
+                                 const std::string& display_languages);
 
  protected:
-  GeolocationInfoBarDelegate(PermissionQueueController* controller,
+  GeolocationInfoBarDelegate(InfoBarService* infobar_service,
+                             PermissionQueueController* controller,
                              const PermissionRequestID& id,
                              const GURL& requesting_frame,
                              int contents_unique_id,