Revert 238283 "Infobar system refactor."

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

 // Copyright (c) 2011 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
 
 #include "base/logging.h"
 #include "base/mac/mac_util.h"
+#include "base/message_loop/message_loop.h"
 #include "chrome/browser/infobars/confirm_infobar_delegate.h"
 #include "chrome/browser/infobars/infobar.h"
 #include "chrome/browser/infobars/infobar_container.h"
 #include "chrome/browser/infobars/infobar_service.h"
 #import "chrome/browser/ui/cocoa/browser_window_controller.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_cocoa.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_cocoa.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_controller.h"
 #import "chrome/browser/ui/cocoa/location_bar/location_bar_view_mac.h"
 #import "chrome/browser/ui/cocoa/view_id_util.h"
@@ skipping 73 matching lines @@
 
   NSView* relativeView = nil;
   if (position > 0)
     relativeView = [[infobarControllers_ objectAtIndex:position - 1] view];
   [[self view] addSubview:[controller view]
                positioned:NSWindowAbove
                relativeTo:relativeView];
 }
 
 - (void)removeInfoBar:(InfoBarCocoa*)infobar {
-  [infobar->controller() infobarWillHide];
-  [self removeController:infobar->controller()];
+  InfoBarController* controller = infobar->controller();
+  [controller infobarWillClose];
+  infobar->set_controller(nil);
+  [self removeController:controller];
+  base::MessageLoop::current()->DeleteSoon(FROM_HERE, infobar);
 }
 
 - (void)positionInfoBarsAndRedraw:(BOOL)isAnimating {
   if (isAnimating_ != isAnimating) {
     isAnimating_ = isAnimating;
     if ([resizeDelegate_ respondsToSelector:@selector(setAnimationInProgress:)])
       [resizeDelegate_ setAnimationInProgress:isAnimating_];
   }
 
   NSRect containerBounds = [[self view] bounds];
@@ skipping 42 matching lines @@
 
   // This code can be executed while InfoBarController is still on the stack, so
   // we retain and autorelease the controller to prevent it from being
   // dealloc'ed too early.
   [[controller retain] autorelease];
   [[controller view] removeFromSuperview];
   [infobarControllers_ removeObject:controller];
 }
 
 @end