Fix scroll restoration when exiting fullscreen mode.

ui/views/controls/webview/webview_unittest.cc

 // Copyright 2014 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 "ui/views/controls/webview/webview.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/test/test_browser_context.h"
@@ skipping 260 matching lines @@
   web_view()->SetWebContents(web_contents.get());
 
   // Initially, the holder should fill the entire WebView.
   EXPECT_EQ(gfx::Rect(0, 0, 100, 100), holder()->bounds());
 
   // Simulate a transition into fullscreen mode, but without screen capture
   // active on the WebContents, the holder should still fill the entire
   // WebView like before.
   delegate.set_is_fullscreened(true);
   static_cast<content::WebContentsObserver*>(web_view())->
-      DidToggleFullscreenModeForTab(true);
+      DidToggleFullscreenModeForTab(true, false);
   EXPECT_EQ(gfx::Rect(0, 0, 100, 100), holder()->bounds());
 
   // ...and transition back out of fullscreen mode.
   delegate.set_is_fullscreened(false);
   static_cast<content::WebContentsObserver*>(web_view())->
-      DidToggleFullscreenModeForTab(false);
+      DidToggleFullscreenModeForTab(false, false);
   EXPECT_EQ(gfx::Rect(0, 0, 100, 100), holder()->bounds());
 
   // Now, begin screen capture of the WebContents and then enter fullscreen
   // mode.  This time, the holder should be centered within WebView and
   // sized to match the capture size.
   const gfx::Size capture_size(64, 48);
   web_contents->IncrementCapturerCount(capture_size);
   delegate.set_is_fullscreened(true);
   static_cast<content::WebContentsObserver*>(web_view())->
-      DidToggleFullscreenModeForTab(true);
+      DidToggleFullscreenModeForTab(true, false);
   EXPECT_EQ(gfx::Rect(18, 26, 64, 48), holder()->bounds());
 
   // Resize the WebView so that its width is smaller than the capture width.
   // Expect the holder to be scaled-down, letterboxed style.
   web_view()->SetBoundsRect(gfx::Rect(0, 0, 32, 32));
   EXPECT_EQ(gfx::Rect(0, 4, 32, 24), holder()->bounds());
 
   // Transition back out of fullscreen mode a final time and confirm the bounds
   // of the holder fill the entire WebView once again.
   delegate.set_is_fullscreened(false);
   static_cast<content::WebContentsObserver*>(web_view())->
-      DidToggleFullscreenModeForTab(false);
+      DidToggleFullscreenModeForTab(false, false);
   EXPECT_EQ(gfx::Rect(0, 0, 32, 32), holder()->bounds());
 }
 
 // Tests that a WebView correctly switches between WebContentses when one of
 // them is embedding a fullscreen widget during WebContents screen capture.
 TEST_F(WebViewUnitTest, EmbeddedFullscreenDuringScreenCapture_Switching) {
   web_view()->SetEmbedFullscreenWidgetMode(true);
   ASSERT_EQ(1, web_view()->child_count());
   const gfx::NativeView unset_native_view = holder()->native_view();
 
@@ skipping 10 matching lines @@
   EXPECT_EQ(web_contents1->GetNativeView(), holder()->native_view());
   EXPECT_EQ(gfx::Rect(0, 0, 100, 100), holder()->bounds());
 
   // Begin screen capture of the WebContents and then enter fullscreen mode.
   // The native view should not have changed, but the layout of its holder will
   // have (indicates WebView has responded).
   const gfx::Size capture_size(64, 48);
   web_contents1->IncrementCapturerCount(capture_size);
   delegate1.set_is_fullscreened(true);
   static_cast<content::WebContentsObserver*>(web_view())->
-      DidToggleFullscreenModeForTab(true);
+      DidToggleFullscreenModeForTab(true, false);
   EXPECT_EQ(web_contents1->GetNativeView(), holder()->native_view());
   EXPECT_EQ(gfx::Rect(18, 26, 64, 48), holder()->bounds());
 
   // When setting the WebContents to nullptr, the native view should become
   // unset.
   web_view()->SetWebContents(nullptr);
   EXPECT_EQ(unset_native_view, holder()->native_view());
 
   // ...and when setting the WebContents back to the currently-fullscreened
   // instance, expect the native view and layout to reflect that.
@@ skipping 32 matching lines @@
   web_contents->SetDelegate(&delegate);
   web_view()->SetWebContents(web_contents.get());
 
   // Begin screen capture of the WebContents and then enter fullscreen mode.
   // The holder should be centered within WebView and sized to match the capture
   // size.
   const gfx::Size capture_size(64, 48);
   web_contents->IncrementCapturerCount(capture_size);
   delegate.set_is_fullscreened(true);
   static_cast<content::WebContentsObserver*>(web_view())->
-      DidToggleFullscreenModeForTab(true);
+      DidToggleFullscreenModeForTab(true, false);
   EXPECT_EQ(gfx::Rect(18, 21, 64, 48), holder()->bounds());
 
   // Focus the other widget.
   something_to_focus->RequestFocus();
   EXPECT_FALSE(web_view()->HasFocus());
   EXPECT_FALSE(holder()->HasFocus());
   EXPECT_TRUE(something_to_focus->HasFocus());
 
   // Send mouse press event to WebView outside the bounds of the holder, and
   // confirm WebView took focus.
@@ skipping 24 matching lines @@
       gfx::Point(),  // Immaterial.
       ui::EventTimeForNow(), ui::EF_LEFT_MOUSE_BUTTON, 0);
   EXPECT_FALSE(static_cast<views::View*>(web_view())->
                   OnMousePressed(click_inside_holder));
   EXPECT_FALSE(web_view()->HasFocus());
   EXPECT_FALSE(holder()->HasFocus());
   EXPECT_TRUE(something_to_focus->HasFocus());
 }
 
 }  // namespace views