mac: Fix a history swiper bug where the shield wouldn't disappear.

chrome/browser/ui/cocoa/history_overlay_controller_unittest.mm

 // Copyright (c) 2012 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 "chrome/browser/ui/cocoa/history_overlay_controller.h"
 
 #import <QuartzCore/QuartzCore.h>
 
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_pump_mac.h"
@@ skipping 13 matching lines @@
   }
 
   NSView* test_view() {
     return test_view_;
   }
 
  private:
   base::scoped_nsobject<NSView> test_view_;
 };
 
-// Tests that the controller's view gets removed from the hierarchy when the
-// controller is deallocated.
-TEST_F(HistoryOverlayControllerTest, RemovedViewWhenDeallocated) {
+// Tests that when the controller is |-dismiss|ed, the animation runs and then
+// is removed when the animation completes. The view should be added and
+// removed at the appropriate times.
+TEST_F(HistoryOverlayControllerTest, DismissClearsAnimationsAndRemovesView) {
   NSView* content_view = [test_window() contentView];
   EXPECT_EQ(1u, [[content_view subviews] count]);
 
   base::scoped_nsobject<HistoryOverlayController> controller(
       [[HistoryOverlayController alloc] initForMode:kHistoryOverlayModeBack]);
   [controller showPanelForView:test_view()];
   EXPECT_EQ(2u, [[content_view subviews] count]);
 
-  controller.reset();
-  EXPECT_EQ(1u, [[content_view subviews] count]);
-}
-
-// Tests that when the controller is |-dismiss|ed, the animation runs and then
-// is removed when the animation completes.
-TEST_F(HistoryOverlayControllerTest, DismissClearsAnimations) {
-  base::scoped_nsobject<HistoryOverlayController> controller(
-      [[HistoryOverlayController alloc] initForMode:kHistoryOverlayModeBack]);
-  [controller showPanelForView:test_view()];
-
   scoped_ptr<base::MessagePumpNSRunLoop> message_pump(
       new base::MessagePumpNSRunLoop);
 
   id mock = [OCMockObject partialMockForObject:controller];
   [mock setExpectationOrderMatters:YES];
   [[[mock expect] andForwardToRealObject] dismiss];
 
   // Called after |-animationDidStop:finished:|.
   base::MessagePumpNSRunLoop* weak_message_pump = message_pump.get();
   void (^quit_loop)(NSInvocation* invocation) = ^(NSInvocation* invocation) {
@@ skipping 14 matching lines @@
       [mock dismiss];
   });
 
   // Run the loop, which will dismiss the overlay.
   message_pump->Run(NULL);
 
   EXPECT_OCMOCK_VERIFY(mock);
 
   // After the animation runs, there should be no more animations.
   EXPECT_FALSE([[controller view] animations]);
+
+  EXPECT_EQ(1u, [[content_view subviews] count]);
 }