Fullscreen: make fullscreen requests come from RenderFrame

content/browser/web_contents/web_contents_impl_unittest.cc

Index: content/browser/web_contents/web_contents_impl_unittest.cc
diff --git a/content/browser/web_contents/web_contents_impl_unittest.cc b/content/browser/web_contents/web_contents_impl_unittest.cc
index ba1a8f00734c0f34eb5ead8f5146a8ae860aa2e3..70a27fa1cdbbf428082dcee717158788627366cf 100644
--- a/content/browser/web_contents/web_contents_impl_unittest.cc
+++ b/content/browser/web_contents/web_contents_impl_unittest.cc
@@ -300,6 +300,7 @@ class FakeFullscreenDelegate : public WebContentsDelegate {
   ~FakeFullscreenDelegate() override {}
 
   void ToggleFullscreenModeForTab(WebContents* web_contents,
+                                  const GURL& origin,
                                   bool enter_fullscreen) override {
     fullscreened_contents_ = enter_fullscreen ? web_contents : NULL;
   }
@@ -1299,8 +1300,8 @@ TEST_F(WebContentsImplTest, NavigationExitsFullscreen) {
   EXPECT_FALSE(orig_rvh->IsFullscreen());
   EXPECT_FALSE(contents()->IsFullscreenForCurrentTab());
   EXPECT_FALSE(fake_delegate.IsFullscreenForTabOrPending(contents()));
-  orig_rvh->OnMessageReceived(
-      ViewHostMsg_ToggleFullscreen(orig_rvh->GetRoutingID(), true));
+  orig_rfh->OnMessageReceived(
+      FrameHostMsg_ToggleFullscreen(orig_rfh->GetRoutingID(), true));
   EXPECT_TRUE(orig_rvh->IsFullscreen());
   EXPECT_TRUE(contents()->IsFullscreenForCurrentTab());
   EXPECT_TRUE(fake_delegate.IsFullscreenForTabOrPending(contents()));
@@ -1351,8 +1352,8 @@ TEST_F(WebContentsImplTest, HistoryNavigationExitsFullscreen) {
 
   for (int i = 0; i < 2; ++i) {
     // Toggle fullscreen mode on (as if initiated via IPC from renderer).
-    orig_rvh->OnMessageReceived(
-        ViewHostMsg_ToggleFullscreen(orig_rvh->GetRoutingID(), true));
+    orig_rfh->OnMessageReceived(
+        FrameHostMsg_ToggleFullscreen(orig_rfh->GetRoutingID(), true));
     EXPECT_TRUE(orig_rvh->IsFullscreen());
     EXPECT_TRUE(contents()->IsFullscreenForCurrentTab());
     EXPECT_TRUE(fake_delegate.IsFullscreenForTabOrPending(contents()));
@@ -1409,8 +1410,8 @@ TEST_F(WebContentsImplTest, CrashExitsFullscreen) {
   EXPECT_FALSE(test_rvh()->IsFullscreen());
   EXPECT_FALSE(contents()->IsFullscreenForCurrentTab());
   EXPECT_FALSE(fake_delegate.IsFullscreenForTabOrPending(contents()));
-  test_rvh()->OnMessageReceived(
-      ViewHostMsg_ToggleFullscreen(test_rvh()->GetRoutingID(), true));
+  contents()->GetMainFrame()->OnMessageReceived(FrameHostMsg_ToggleFullscreen(
+      contents()->GetMainFrame()->GetRoutingID(), true));
   EXPECT_TRUE(test_rvh()->IsFullscreen());
   EXPECT_TRUE(contents()->IsFullscreenForCurrentTab());
   EXPECT_TRUE(fake_delegate.IsFullscreenForTabOrPending(contents()));