Infobar system refactor.

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

Index: chrome/browser/ui/cocoa/infobars/infobar_cocoa.mm
===================================================================
--- chrome/browser/ui/cocoa/infobars/infobar_cocoa.mm	(revision 238220)
+++ chrome/browser/ui/cocoa/infobars/infobar_cocoa.mm	(working copy)
@@ -4,6 +4,8 @@
 
 #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;
@@ -11,18 +13,16 @@
 const int InfoBar::kMaximumArrowTargetHalfWidth = 14;
 const int InfoBar::kDefaultBarTargetHeight = 36;
 
-InfoBarCocoa::InfoBarCocoa(InfoBarService* owner, InfoBarDelegate* delegate)
-    : InfoBar(owner, delegate),
+InfoBarCocoa::InfoBarCocoa(scoped_ptr<InfoBarDelegate> delegate)
+    : InfoBar(delegate.Pass()),
       weak_ptr_factory_(this) {
 }
 
 InfoBarCocoa::~InfoBarCocoa() {
+  if (controller())
+    [controller() infobarWillClose];
 }
 
-void InfoBarCocoa::RemoveSelfCocoa() {
-  RemoveSelf();
-}
-
 InfoBarService* InfoBarCocoa::OwnerCocoa() {
   return owner();
 }