Revert 238283 "Infobar system refactor."

trunk/src/chrome/browser/ui/cocoa/infobars/infobar_cocoa.h

Index: trunk/src/chrome/browser/ui/cocoa/infobars/infobar_cocoa.h
===================================================================
--- trunk/src/chrome/browser/ui/cocoa/infobars/infobar_cocoa.h	(revision 238401)
+++ trunk/src/chrome/browser/ui/cocoa/infobars/infobar_cocoa.h	(working copy)
@@ -15,7 +15,7 @@
 // actually in InfoBarController.
 class InfoBarCocoa : public InfoBar {
  public:
-  explicit InfoBarCocoa(scoped_ptr<InfoBarDelegate> delegate);
+  InfoBarCocoa(InfoBarService* owner, InfoBarDelegate* delegate);
 
   virtual ~InfoBarCocoa();
 
@@ -26,6 +26,7 @@
   }
 
   // These functions allow access to protected InfoBar functions.
+  void RemoveSelfCocoa();
   InfoBarService* OwnerCocoa();
 
   base::WeakPtr<InfoBarCocoa> GetWeakPtr();