Separate RenderViewHost from RenderWidgetHost, part 2: public implementation.

content/browser/web_contents/web_contents_impl_unittest.cc

 // 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 "base/command_line.h"
 #include "base/logging.h"
 #include "base/strings/utf_string_conversions.h"
 #include "content/browser/frame_host/cross_site_transferring_request.h"
 #include "content/browser/frame_host/interstitial_page_impl.h"
 #include "content/browser/frame_host/navigation_entry_impl.h"
@@ skipping 2675 matching lines @@
   contents()->DecrementCapturerCount();
   EXPECT_EQ(0, contents()->GetCapturerCount());
   EXPECT_EQ(original_preferred_size, contents()->GetPreferredSize());
 }
 
 TEST_F(WebContentsImplTest, CapturerPreventsHiding) {
   const gfx::Size original_preferred_size(1024, 768);
   contents()->UpdatePreferredSize(original_preferred_size);
 
   TestRenderWidgetHostView* view = static_cast<TestRenderWidgetHostView*>(
-      contents()->GetMainFrame()->GetRenderViewHost()->GetView());
+      contents()->GetMainFrame()->GetRenderViewHost()->GetWidget()->GetView());
 
   // With no capturers, setting and un-setting occlusion should change the
   // view's occlusion state.
   EXPECT_FALSE(view->is_showing());
   contents()->WasShown();
   EXPECT_TRUE(view->is_showing());
   contents()->WasHidden();
   EXPECT_FALSE(view->is_showing());
   contents()->WasShown();
   EXPECT_TRUE(view->is_showing());
 
   // Add a capturer and try to hide the contents. The view will remain visible.
   contents()->IncrementCapturerCount(gfx::Size());
   contents()->WasHidden();
   EXPECT_TRUE(view->is_showing());
 
   // Remove the capturer, and the WasHidden should take effect.
   contents()->DecrementCapturerCount();
   EXPECT_FALSE(view->is_showing());
 }
 
 TEST_F(WebContentsImplTest, CapturerPreventsOcclusion) {
   const gfx::Size original_preferred_size(1024, 768);
   contents()->UpdatePreferredSize(original_preferred_size);
 
   TestRenderWidgetHostView* view = static_cast<TestRenderWidgetHostView*>(
-      contents()->GetMainFrame()->GetRenderViewHost()->GetView());
+      contents()->GetMainFrame()->GetRenderViewHost()->GetWidget()->GetView());
 
   // With no capturers, setting and un-setting occlusion should change the
   // view's occlusion state.
   EXPECT_FALSE(view->is_occluded());
   contents()->WasOccluded();
   EXPECT_TRUE(view->is_occluded());
   contents()->WasUnOccluded();
   EXPECT_FALSE(view->is_occluded());
   contents()->WasOccluded();
   EXPECT_TRUE(view->is_occluded());
@@ skipping 642 matching lines @@
   backend->AllowCertForHost(*cert, test_url.host(), 1);
   EXPECT_TRUE(backend->HasAllowException(test_url.host()));
 
   contents()->OnDidLoadResourceFromMemoryCache(test_url, "", "GET", "mime type",
                                                RESOURCE_TYPE_MAIN_FRAME);
 
   EXPECT_TRUE(backend->HasAllowException(test_url.host()));
 }
 
 }  // namespace content