[Mac] Enables animations for the infobar....

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"
+#import "chrome/browser/cocoa/infobar_container_controller.h"
 #import "chrome/browser/cocoa/infobar_controller.h"
 #include "chrome/browser/cocoa/infobar_test_helper.h"
 #include "chrome/browser/tab_contents/infobar_delegate.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "testing/platform_test.h"
 
 @interface InfoBarController (ExposedForTesting)
 - (NSTextField*)label;
 @end
 
 @implementation InfoBarController (ExposedForTesting)
 - (NSTextField*)label {
   return label_;
 }
 @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.
+@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];
+}
+
+- (void)removeController:(InfoBarController*)controller {
+  DCHECK(controller_ == controller);
+  controller_ = nil;
+}
+@end
+
 namespace {
 
 ///////////////////////////////////////////////////////////////////////////
 // Test fixtures
 
 class AlertInfoBarControllerTest : public PlatformTest {
  public:
   virtual void SetUp() {
     PlatformTest::SetUp();
 
     controller_.reset(
         [[AlertInfoBarController alloc] initWithDelegate:&delegate_]);
+    container_.reset(
+        [[InfoBarContainerTest alloc] initWithController:controller_]);
+    [controller_ setContainerController:container_];
     [helper_.contentView() addSubview:[controller_ view]];
   }
 
  protected:
   CocoaTestHelper helper_;
   MockAlertInfoBarDelegate delegate_;
+  scoped_nsobject<id> container_;
   scoped_nsobject<AlertInfoBarController> controller_;
 };
 
 class LinkInfoBarControllerTest : public PlatformTest {
  public:
   virtual void SetUp() {
     PlatformTest::SetUp();
 
     controller_.reset(
         [[LinkInfoBarController alloc] initWithDelegate:&delegate_]);
+    container_.reset(
+        [[InfoBarContainerTest alloc] initWithController:controller_]);
+    [controller_ setContainerController:container_];
     [helper_.contentView() addSubview:[controller_ view]];
   }
 
  protected:
   CocoaTestHelper helper_;
   MockLinkInfoBarDelegate delegate_;
+  scoped_nsobject<id> container_;
   scoped_nsobject<LinkInfoBarController> controller_;
 };
 
 class ConfirmInfoBarControllerTest : public PlatformTest {
  public:
   virtual void SetUp() {
     PlatformTest::SetUp();
 
     controller_.reset(
         [[ConfirmInfoBarController alloc] initWithDelegate:&delegate_]);
+    container_.reset(
+        [[InfoBarContainerTest alloc] initWithController:controller_]);
+    [controller_ setContainerController:container_];
     [helper_.contentView() addSubview:[controller_ view]];
   }
 
  protected:
   CocoaTestHelper helper_;
   MockConfirmInfoBarDelegate delegate_;
+  scoped_nsobject<id> container_;
   scoped_nsobject<ConfirmInfoBarController> controller_;
 };
 
 
 ////////////////////////////////////////////////////////////////////////////
 // Tests
 
 TEST_F(AlertInfoBarControllerTest, ShowAndDismiss) {
   // Make sure someone looked at the message and icon.
   EXPECT_TRUE(delegate_.message_text_accessed);
@@ skipping 95 matching lines @@
 
   // Check that clicking the cancel button calls Cancel() but does not close
   // the infobar.
   [controller_ cancel:nil];
   EXPECT_FALSE(delegate_.ok_clicked);
   EXPECT_TRUE(delegate_.cancel_clicked);
   EXPECT_FALSE(delegate_.closed);
 }
 
 }  // namespace