Separate RenderViewHost from RenderWidgetHost, part 10: shutdown.

content/browser/renderer_host/render_widget_host_view_mac_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.
 
 #include "content/browser/renderer_host/render_widget_host_view_mac.h"
 
 #include <Cocoa/Cocoa.h>
 
 #include "base/mac/mac_util.h"
 #include "base/mac/scoped_nsautorelease_pool.h"
@@ skipping 705 matching lines @@
   EXPECT_CALL(*rwh, Blur());
   [window makeFirstResponder:nil];
   testing::Mock::VerifyAndClearExpectations(rwh);
 
   // |SetActive()| shoud not focus if view is not first responder.
   EXPECT_CALL(*rwh, Focus()).Times(0);
   view->SetActive(true);
   testing::Mock::VerifyAndClearExpectations(rwh);
 
   // Clean up.
-  rwh->Shutdown();
+  rwh->ShutdownAndDestroyWidget(true);
 }
 
 TEST_F(RenderWidgetHostViewMacTest, ScrollWheelEndEventDelivery) {
   // This tests Lion+ functionality, so don't run the test pre-Lion.
   if (!base::mac::IsOSLionOrLater())
     return;
 
   // Initialize the view associated with a MockRenderWidgetHostImpl, rather than
   // the MockRenderProcessHost that is set up by the test harness which mocks
   // out |OnMessageReceived()|.
@@ skipping 20 matching lines @@
   host->OnMessageReceived(*response);
 
   // Post the NSEventPhaseEnded wheel event to NSApp and check whether the
   // render view receives it.
   NSEvent* event2 = MockScrollWheelEventWithPhase(@selector(phaseEnded), 0);
   [NSApp postEvent:event2 atStart:NO];
   base::MessageLoop::current()->RunUntilIdle();
   ASSERT_EQ(2U, process_host->sink().message_count());
 
   // Clean up.
-  host->Shutdown();
+  host->ShutdownAndDestroyWidget(true);
 }
 
 TEST_F(RenderWidgetHostViewMacTest, IgnoreEmptyUnhandledWheelEvent) {
   // This tests Lion+ functionality, so don't run the test pre-Lion.
   if (!base::mac::IsOSLionOrLater())
     return;
 
   // Initialize the view associated with a MockRenderWidgetHostImpl, rather than
   // the MockRenderProcessHost that is set up by the test harness which mocks
   // out |OnMessageReceived()|.
@@ skipping 36 matching lines @@
 
   // Indicate that the wheel event was also unhandled.
   scoped_ptr<IPC::Message> response2(
       new InputHostMsg_HandleInputEvent_ACK(0, unhandled_ack));
   host->OnMessageReceived(*response2);
 
   // Check that the view delegate ignored the empty unhandled wheel event.
   ASSERT_EQ(NO, view_delegate.get().unhandledWheelEventReceived);
 
   // Clean up.
-  host->Shutdown();
+  host->ShutdownAndDestroyWidget(true);
 }
 
 // Tests that when view initiated shutdown happens (i.e. RWHView is deleted
 // before RWH), we clean up properly and don't leak the RWHVGuest.
 TEST_F(RenderWidgetHostViewMacTest, GuestViewDoesNotLeak) {
   MockRenderWidgetHostDelegate delegate;
   TestBrowserContext browser_context;
   MockRenderProcessHost* process_host =
       new MockRenderProcessHost(&browser_context);
   int32 routing_id = process_host->GetNextRoutingID();
@@ skipping 13 matching lines @@
            rwh, NULL, view->GetWeakPtr()))->GetWeakPtr();
 
   // Remove the cocoa_view() so |view| also goes away before |rwh|.
   {
     base::scoped_nsobject<RenderWidgetHostViewCocoa> rwhv_cocoa;
     rwhv_cocoa.reset([view->cocoa_view() retain]);
   }
   RecycleAndWait();
 
   // Clean up.
-  rwh->Shutdown();
+  rwh->ShutdownAndDestroyWidget(true);
 
   // Let |guest_rwhv_weak| have a chance to delete itself.
   base::RunLoop run_loop;
   content::BrowserThread::PostTask(
       content::BrowserThread::UI, FROM_HERE, run_loop.QuitClosure());
   run_loop.Run();
 
   ASSERT_FALSE(guest_rwhv_weak.get());
 }
 
@@ skipping 29 matching lines @@
   process_host->sink().ClearMessages();
   view->SetBackgroundColor(SK_ColorWHITE);
   EXPECT_TRUE(view->GetBackgroundOpaque());
   EXPECT_TRUE([view->cocoa_view() isOpaque]);
   set_background = process_host->sink().GetUniqueMessageMatching(
       ViewMsg_SetBackgroundOpaque::ID);
   ASSERT_TRUE(set_background);
   ViewMsg_SetBackgroundOpaque::Read(set_background, &sent_background);
   EXPECT_TRUE(base::get<0>(sent_background));
 
-  host->Shutdown();
+  host->ShutdownAndDestroyWidget(true);
 }
 
 class RenderWidgetHostViewMacPinchTest : public RenderWidgetHostViewMacTest {
  public:
   RenderWidgetHostViewMacPinchTest() : process_host_(NULL) {}
 
   bool ZoomDisabledForPinchUpdateMessage() {
     const IPC::Message* message = NULL;
     // The first message may be a PinchBegin. Go for the second message if
     // there are two.
@@ skipping 131 matching lines @@
     EXPECT_TRUE(ZoomDisabledForPinchUpdateMessage());
     host->OnMessageReceived(*response);
     process_host_->sink().ClearMessages();
 
     [view->cocoa_view() endGestureWithEvent:pinchEndEvent];
     EXPECT_EQ(1U, process_host_->sink().message_count());
     process_host_->sink().ClearMessages();
   }
 
   // Clean up.
-  host->Shutdown();
+  host->ShutdownAndDestroyWidget(true);
 }
 
 
 }  // namespace content