Make infobars ignore button clicks when closing.

chrome/browser/ui/cocoa/infobars/infobar_controller_unittest.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 <Cocoa/Cocoa.h>
 
 #include "base/memory/scoped_nsobject.h"
 #include "base/string_util.h"
 #include "base/sys_string_conversions.h"
 #include "chrome/browser/tab_contents/confirm_infobar_delegate.h"
@@ skipping 72 matching lines @@
   [self close];
 }
 @end
 
 namespace {
 
 ///////////////////////////////////////////////////////////////////////////
 // Test fixtures
 
 class LinkInfoBarControllerTest : public CocoaTest,
+                                  public TabContentsWrapperTestHarness,
                                   public MockLinkInfoBarDelegate::Owner {
  public:
+  LinkInfoBarControllerTest() {
+    contents_wrapper()->infobar_tab_helper()->set_infobars_enabled(false);
+  }
   virtual void SetUp() {
     CocoaTest::SetUp();
 
     delegate_ = new MockLinkInfoBarDelegate(this);
-    controller_.reset(
-        [[TestLinkInfoBarController alloc] initWithDelegate:delegate_
-                                                      owner:NULL]);
+    controller_.reset([[TestLinkInfoBarController alloc]
+        initWithDelegate:delegate_
+                   owner:contents_wrapper()]);
     container_.reset(
         [[InfoBarContainerTest alloc] initWithController:controller_]);
     [controller_ setContainerController:container_];
     [[test_window() contentView] addSubview:[controller_ view]];
     closed_delegate_link_clicked_ = false;
   }
 
   virtual void TearDown() {
     if (delegate_)
       delete delegate_;
@@ skipping 10 matching lines @@
   bool closed_delegate_link_clicked_;
 
  private:
   virtual void OnInfoBarDelegateClosed() {
     closed_delegate_link_clicked_ = delegate_->link_clicked();
     delegate_ = NULL;
   }
 };
 
 class ConfirmInfoBarControllerTest : public CocoaTest,
+                                     public TabContentsWrapperTestHarness,
                                      public MockConfirmInfoBarDelegate::Owner {
  public:
+  ConfirmInfoBarControllerTest() {
+    contents_wrapper()->infobar_tab_helper()->set_infobars_enabled(false);
+  }
   virtual void SetUp() {
     CocoaTest::SetUp();
 
     delegate_ = new MockConfirmInfoBarDelegate(this);
-    controller_.reset(
-        [[TestConfirmInfoBarController alloc] initWithDelegate:delegate_
-                                                         owner:NULL]);
+    controller_.reset([[TestConfirmInfoBarController alloc]
+        initWithDelegate:delegate_
+                   owner:contents_wrapper()]);
     container_.reset(
         [[InfoBarContainerTest alloc] initWithController:controller_]);
     [controller_ setContainerController:container_];
     [[test_window() contentView] addSubview:[controller_ view]];
     closed_delegate_ok_clicked_ = false;
     closed_delegate_cancel_clicked_ = false;
     closed_delegate_link_clicked_ = false;
   }
 
   virtual void TearDown() {
@@ skipping 28 matching lines @@
 
 TEST_VIEW(LinkInfoBarControllerTest, [controller_ view]);
 
 TEST_F(LinkInfoBarControllerTest, ShowAndDismiss) {
   // Make sure someone looked at the message, link, and icon.
   EXPECT_TRUE(delegate_->message_text_accessed());
   EXPECT_TRUE(delegate_->link_text_accessed());
   EXPECT_TRUE(delegate_->icon_accessed());
 
   // Check that dismissing the infobar deletes the delegate.
-  [controller_ dismiss:nil];
+  [controller_ removeSelf];
   ASSERT_TRUE(delegate_closed());
   EXPECT_FALSE(closed_delegate_link_clicked_);
 }
 
 TEST_F(LinkInfoBarControllerTest, ShowAndClickLink) {
   // Check that clicking on the link calls LinkClicked() on the
   // delegate.  It should also close the infobar.
   [controller_ linkClicked];
 
   // Spin the runloop because the invocation for closing the infobar is done on
@@ skipping 26 matching lines @@
   // Make sure someone looked at the message, link, and icon.
   EXPECT_TRUE(delegate_->message_text_accessed());
   EXPECT_TRUE(delegate_->link_text_accessed());
   EXPECT_TRUE(delegate_->icon_accessed());
 
   // Check to make sure the infobar message was set properly.
   EXPECT_EQ(MockConfirmInfoBarDelegate::kMessage,
             base::SysNSStringToUTF8([controller_.get() labelString]));
 
   // Check that dismissing the infobar deletes the delegate.
-  [controller_ dismiss:nil];
+  [controller_ removeSelf];
   ASSERT_TRUE(delegate_closed());
   EXPECT_FALSE(closed_delegate_ok_clicked_);
   EXPECT_FALSE(closed_delegate_cancel_clicked_);
   EXPECT_FALSE(closed_delegate_link_clicked_);
 }
 
 TEST_F(ConfirmInfoBarControllerTest, ShowAndClickOK) {
   // Check that clicking the OK button calls Accept() and then closes
   // the infobar.
   [controller_ ok:nil];
@@ skipping 67 matching lines @@
   const CGFloat width = 20;
   NSRect newViewFrame = [[controller_ view] frame];
   newViewFrame.size.width += width;
   [[controller_ view] setFrame:newViewFrame];
 
   NSRect newLabelFrame = [controller_ labelFrame];
   EXPECT_EQ(NSWidth(newLabelFrame), NSWidth(originalLabelFrame) + width);
 }
 
 }  // namespace