Fix scroll restoration when exiting fullscreen mode.

chrome/browser/ui/exclusive_access/fullscreen_controller_state_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 "build/build_config.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
 #include "chrome/browser/ui/exclusive_access/exclusive_access_context.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/test/base/browser_with_test_window_test.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/common/url_constants.h"
+#include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
 // The FullscreenControllerStateUnitTest unit test suite exhastively tests
 // the FullscreenController through all permutations of events. The behavior
 // of the BrowserWindow is mocked via FullscreenControllerTestWindow.
 
 
 // FullscreenControllerTestWindow ----------------------------------------------
 
 // A BrowserWindow used for testing FullscreenController. The behavior of this
@@ skipping 716 matching lines @@
   // tab fullscreen mode.  The browser window should stay fullscreened, while
   // the tab exits fullscreen mode.
   ASSERT_TRUE(InvokeEvent(TOGGLE_FULLSCREEN));
   ASSERT_TRUE(InvokeEvent(WINDOW_CHANGE));
   ASSERT_TRUE(InvokeEvent(TAB_FULLSCREEN_FALSE));
   EXPECT_FALSE(wc_delegate->IsFullscreenForTabOrPending(tab));
   EXPECT_FALSE(GetFullscreenController()->IsWindowFullscreenForTabOrPending());
   EXPECT_TRUE(GetFullscreenController()->IsFullscreenForBrowser());
 }
 
+class FullscreenChangeObserver : public content::WebContentsObserver {
+ public:
+  explicit FullscreenChangeObserver(content::WebContents* web_contents)
+      : WebContentsObserver(web_contents) {
+  }
+
+  MOCK_METHOD2(DidToggleFullscreenModeForTab, void(bool, bool));
+
+ private:
+
+  DISALLOW_COPY_AND_ASSIGN(FullscreenChangeObserver);
+};
+
+// Tests that going from tab fullscreen -> browser fullscreen causes an explicit

[scheib, 2016/01/04 22:26:48]

Comment here and in body describes how ::WasResized should be called but doesn't
explain that it is the 2nd 'false' parameter to DidToggleFullscreenModeForTab
that will cause that to happen. Add brief note to that effect, probably just in
the body comments.

[bokan, 2016/01/05 15:37:11]

Done.

+// WasResized to be called on ExitFullscreen while going from tab fullscreen ->
+// Normal does not. This ensures that the Resize message we get in the renderer
+// will have both the fullscreen change and size change in the same message.
+// crbug.com/142427.
+TEST_F(FullscreenControllerStateUnitTest, TabToBrowserFullscreenCausesResize) {
+  AddTab(browser(), GURL(url::kAboutBlankURL));
+  content::WebContents* const tab =
+      browser()->tab_strip_model()->GetWebContentsAt(0);
+
+  FullscreenChangeObserver fullscreenObserver(tab);
+
+  // Go into browser fullscreen, then tab fullscreen. Exiting tab fullscreen
+  // should call WasResized since the fullscreen change wont cause a size change
+  // itself.
+  ASSERT_TRUE(InvokeEvent(TOGGLE_FULLSCREEN));
+  ASSERT_TRUE(InvokeEvent(WINDOW_CHANGE));
+  ASSERT_TRUE(InvokeEvent(TAB_FULLSCREEN_TRUE));
+  ASSERT_TRUE(browser()->window()->IsFullscreen());
+
+  EXPECT_CALL(fullscreenObserver,
+              DidToggleFullscreenModeForTab(false, false));
+  ASSERT_TRUE(InvokeEvent(TAB_FULLSCREEN_FALSE));
+  testing::Mock::VerifyAndClearExpectations(&fullscreenObserver);
+
+  ASSERT_TRUE(InvokeEvent(TOGGLE_FULLSCREEN));
+  ASSERT_TRUE(InvokeEvent(WINDOW_CHANGE));
+  ASSERT_FALSE(browser()->window()->IsFullscreen());
+
+  // Go into tab fullscreen only. Exiting tab fullscreen should *not* cause
+  // a call to WasResized since the window will change size and we want the
+  // fullscreen change and size change to be in one Resize message.
+  ASSERT_TRUE(InvokeEvent(TAB_FULLSCREEN_TRUE));
+  ASSERT_TRUE(InvokeEvent(WINDOW_CHANGE));
+  ASSERT_TRUE(browser()->window()->IsFullscreen());
+
+  EXPECT_CALL(fullscreenObserver,
+              DidToggleFullscreenModeForTab(false, true));
+  ASSERT_TRUE(InvokeEvent(TAB_FULLSCREEN_FALSE));
+  ASSERT_FALSE(browser()->window()->IsFullscreen());
+  testing::Mock::VerifyAndClearExpectations(&fullscreenObserver);
+}
+
 // Tests that the state of a fullscreened, screen-captured tab is preserved if
 // the tab is detached from one Browser window and attached to another.
 //
 // See 'FullscreenWithinTab Note' in fullscreen_controller.h.
 TEST_F(FullscreenControllerStateUnitTest,
        CapturedFullscreenedTabTransferredBetweenBrowserWindows) {
   content::WebContentsDelegate* const wc_delegate =
       static_cast<content::WebContentsDelegate*>(browser());
   ASSERT_TRUE(wc_delegate->EmbedsFullscreenWidget());
 
@@ skipping 66 matching lines @@
   EXPECT_FALSE(wc_delegate->IsFullscreenForTabOrPending(tab));
   EXPECT_FALSE(second_wc_delegate->IsFullscreenForTabOrPending(tab));
   EXPECT_FALSE(GetFullscreenController()->IsWindowFullscreenForTabOrPending());
   EXPECT_FALSE(second_browser->exclusive_access_manager()
                    ->fullscreen_controller()
                    ->IsWindowFullscreenForTabOrPending());
 
   // Required tear-down specific to this test.
   second_browser->tab_strip_model()->CloseAllTabs();
 }