Replace the virtual InfoBarDelegate::InfoBarClosed() function with a non-virtual one. This is a ...

chrome/browser/ui/cocoa/infobars/infobar_container_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"
 #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/mock_confirm_infobar_delegate.h"
@@ skipping 35 matching lines @@
   [controller_ positionInfoBarsAndRedraw];
   EXPECT_NE(-1, [resizeDelegate_ height]);
 }
 
 TEST_F(InfoBarContainerControllerTest, AddAndRemoveInfoBars) {
   NSView* view = [controller_ view];
 
   // Add three infobars and then remove them.
   // After each step check to make sure we have the correct number of
   // infobar subviews.
-  MockLinkInfoBarDelegate linkDelegate, linkDelegate2;
-  MockConfirmInfoBarDelegate confirmDelegate;
 
-  [controller_ addInfoBar:&linkDelegate animate:NO];
+  // These infobars own themselves.

[Nico, 2011/05/04 21:15:52]

This would be more informative if it was "These infobars delete themselves when
XXX happens" (with XXX = "they are closed" (and "happens" removed I guess))

^ Good example of clear writing

Who owns the delegate?

[Peter Kasting, 2011/05/04 22:54:56]

Changed to "These delegates delete themselves when they're told their infobars
have closed."
Do you ask this because the old comment said "these infobars" rather than "these
delegates"?  Hopefully now things are clear?

+  MockLinkInfoBarDelegate* linkDelegate = new MockLinkInfoBarDelegate(NULL);
+  MockLinkInfoBarDelegate* linkDelegate2 = new MockLinkInfoBarDelegate(NULL);
+  MockConfirmInfoBarDelegate* confirmDelegate =
+      new MockConfirmInfoBarDelegate(NULL);
+
+  [controller_ addInfoBar:linkDelegate animate:NO];
   EXPECT_EQ(1U, [[view subviews] count]);
 
-  [controller_ addInfoBar:&confirmDelegate animate:NO];
+  [controller_ addInfoBar:confirmDelegate animate:NO];
   EXPECT_EQ(2U, [[view subviews] count]);
 
-  [controller_ addInfoBar:&linkDelegate2 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:&confirmDelegate animate:NO];
+  [controller_ closeInfoBarsForDelegate:confirmDelegate animate:NO];
   EXPECT_EQ(2U, [[view subviews] count]);
 
-  [controller_ closeInfoBarsForDelegate:&linkDelegate animate:NO];
+  [controller_ closeInfoBarsForDelegate:linkDelegate animate:NO];
   EXPECT_EQ(1U, [[view subviews] count]);
 
-  [controller_ closeInfoBarsForDelegate:&linkDelegate2 animate:NO];
+  [controller_ closeInfoBarsForDelegate:linkDelegate2 animate:NO];
   EXPECT_EQ(0U, [[view subviews] count]);
 }
 
 TEST_F(InfoBarContainerControllerTest, RemoveAllInfoBars) {
   NSView* view = [controller_ view];
 
   // Add three infobars and then remove them all.
-  MockLinkInfoBarDelegate linkDelegate;
-  MockConfirmInfoBarDelegate confirmDelegate, confirmDelegate2;
 
-  [controller_ addInfoBar:&linkDelegate animate:NO];
-  [controller_ addInfoBar:&confirmDelegate animate:NO];
-  [controller_ addInfoBar:&confirmDelegate2 animate:NO];
+  // These infobars own themselves.
+  MockLinkInfoBarDelegate* linkDelegate = new MockLinkInfoBarDelegate(NULL);
+  MockConfirmInfoBarDelegate* confirmDelegate =
+      new MockConfirmInfoBarDelegate(NULL);
+  MockConfirmInfoBarDelegate* confirmDelegate2 =
+      new MockConfirmInfoBarDelegate(NULL);
+
+  [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