Make TabContents own its infobar delegates....

chrome/browser/cocoa/infobar_controller_unittest.mm

 // Copyright (c) 2009 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 <Cocoa/Cocoa.h>
 
 #include "base/scoped_nsobject.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #import "chrome/browser/cocoa/cocoa_test_helper.h"
@@ skipping 12 matching lines @@
 @implementation InfoBarController (ExposedForTesting)
 - (NSString*)labelString {
   return [label_.get() string];
 }
 - (NSRect)labelFrame {
   return [label_.get() frame];
 }
 @end
 
 
-// Calls to removeDelegate: normally start an animation, which removes the
-// infobar completely when finished.  For unittesting purposes, we create a mock
-// container which calls close: immediately, rather than kicking off an
-// animation.
+// Calls to removeDelegate: normally (a) start an animation, which removes the
+// infobar completely when finished; and (b) synchronously close the delegate.
+// For unittesting purposes, we create a mock container which calls close:
+// immediately, rather than kicking off an animation; the delegate is still
+// closed synchronously.
 @interface InfoBarContainerTest : NSObject <InfoBarContainer> {
   InfoBarController* controller_;
 }
 - (id)initWithController:(InfoBarController*)controller;
 - (void)removeDelegate:(InfoBarDelegate*)delegate;
 - (void)removeController:(InfoBarController*)controller;
 @end
 
 @implementation InfoBarContainerTest
 - (id)initWithController:(InfoBarController*)controller {
   if ((self = [super init])) {
     controller_ = controller;
   }
   return self;
 }
 
 - (void)removeDelegate:(InfoBarDelegate*)delegate {
   [controller_ close];
+  delegate->InfoBarClosed();
 }
 
 - (void)removeController:(InfoBarController*)controller {
   DCHECK(controller_ == controller);
   controller_ = nil;
 }
 @end
 
 namespace {
 
@@ skipping 210 matching lines @@
   // Check that clicking on the link calls LinkClicked() on the
   // delegate.  It should not close the infobar.
   [controller_ linkClicked];
   EXPECT_FALSE(delegate_.ok_clicked);
   EXPECT_FALSE(delegate_.cancel_clicked);
   EXPECT_TRUE(delegate_.link_clicked);
   EXPECT_FALSE(delegate_.closed);
 }
 
 }  // namespace