Revert 238283 "Infobar system refactor."

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

Index: trunk/src/chrome/browser/ui/cocoa/infobars/infobar_cocoa.mm
===================================================================
--- trunk/src/chrome/browser/ui/cocoa/infobars/infobar_cocoa.mm	(revision 238401)
+++ trunk/src/chrome/browser/ui/cocoa/infobars/infobar_cocoa.mm	(working copy)
@@ -4,8 +4,6 @@
 
 #include "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"
 
-#import "chrome/browser/ui/cocoa/infobars/infobar_controller.h"
-
 const int InfoBar::kSeparatorLineHeight = 1;
 const int InfoBar::kDefaultArrowTargetHeight = 11;
 const int InfoBar::kMaximumArrowTargetHeight = 24;
@@ -13,16 +11,18 @@
 const int InfoBar::kMaximumArrowTargetHalfWidth = 14;
 const int InfoBar::kDefaultBarTargetHeight = 36;
 
-InfoBarCocoa::InfoBarCocoa(scoped_ptr<InfoBarDelegate> delegate)
-    : InfoBar(delegate.Pass()),
+InfoBarCocoa::InfoBarCocoa(InfoBarService* owner, InfoBarDelegate* delegate)
+    : InfoBar(owner, delegate),
       weak_ptr_factory_(this) {
 }
 
 InfoBarCocoa::~InfoBarCocoa() {
-  if (controller())
-    [controller() infobarWillClose];
 }
 
+void InfoBarCocoa::RemoveSelfCocoa() {
+  RemoveSelf();
+}
+
 InfoBarService* InfoBarCocoa::OwnerCocoa() {
   return owner();
 }