Cleanup:...

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

-// Copyright (c) 2009 The Chromium Authors. All rights reserved.
+// 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/scoped_nsobject.h"
 #import "chrome/browser/ui/cocoa/cocoa_test_helper.h"
 #import "chrome/browser/ui/cocoa/infobars/infobar_container_controller.h"
 #include "chrome/browser/ui/cocoa/infobars/infobar_test_helper.h"
 #import "chrome/browser/ui/cocoa/view_resizer_pong.h"
@@ skipping 30 matching lines @@
   // Call positionInfoBarsAndResize and check that |resizeDelegate_| got a
   // resize message.
   [resizeDelegate_ setHeight:-1];
   [controller_ positionInfoBarsAndRedraw];
   EXPECT_NE(-1, [resizeDelegate_ height]);
 }
 
 TEST_F(InfoBarContainerControllerTest, AddAndRemoveInfoBars) {
   NSView* view = [controller_ view];
 
-  // Add three infobars, one of each type, and then remove them.
+  // Add three infobars and then remove them.
   // After each step check to make sure we have the correct number of
   // infobar subviews.
-  MockAlertInfoBarDelegate alertDelegate;
-  MockLinkInfoBarDelegate linkDelegate;
+  MockLinkInfoBarDelegate linkDelegate, linkDelegate2;
   MockConfirmInfoBarDelegate confirmDelegate;
 
-  [controller_ addInfoBar:&alertDelegate animate:NO];
+  [controller_ addInfoBar:&linkDelegate animate:NO];
   EXPECT_EQ(1U, [[view subviews] count]);
 
-  [controller_ addInfoBar:&linkDelegate animate:NO];
+  [controller_ addInfoBar:&confirmDelegate animate:NO];
   EXPECT_EQ(2U, [[view subviews] count]);
 
-  [controller_ addInfoBar:&confirmDelegate animate:NO];
+  [controller_ addInfoBar:&linkDelegate2 animate:NO];
   EXPECT_EQ(3U, [[view subviews] count]);
 
   // Just to mix things up, remove them in a different order.
-  [controller_ closeInfoBarsForDelegate:&linkDelegate animate:NO];
+  [controller_ closeInfoBarsForDelegate:&confirmDelegate animate:NO];
   EXPECT_EQ(2U, [[view subviews] count]);
 
-  [controller_ closeInfoBarsForDelegate:&confirmDelegate animate:NO];
+  [controller_ closeInfoBarsForDelegate:&linkDelegate animate:NO];
   EXPECT_EQ(1U, [[view subviews] count]);
 
-  [controller_ closeInfoBarsForDelegate:&alertDelegate animate:NO];
-  EXPECT_EQ(0U, [[view subviews] count]);
+  [controller_ closeInfoBarsForDelegate:&linkDelegate2 animate:NO];
+  EXPECT_EQ(1U, [[view subviews] count]);
 }
 
 TEST_F(InfoBarContainerControllerTest, RemoveAllInfoBars) {
   NSView* view = [controller_ view];
 
   // Add three infobars and then remove them all.
-  MockAlertInfoBarDelegate alertDelegate;
   MockLinkInfoBarDelegate linkDelegate;
-  MockConfirmInfoBarDelegate confirmDelegate;
+  MockConfirmInfoBarDelegate confirmDelegate, confirmDelegate2;
 
-  [controller_ addInfoBar:&alertDelegate animate:NO];
   [controller_ addInfoBar:&linkDelegate animate:NO];
   [controller_ addInfoBar:&confirmDelegate animate:NO];
+  [controller_ addInfoBar:&confirmDelegate2 animate:NO];
   EXPECT_EQ(3U, [[view subviews] count]);
 
   [controller_ removeAllInfoBars];
   EXPECT_EQ(0U, [[view subviews] count]);
 }
 }  // namespace