Deleted fullscreen virtual methods in BrowserWindow.

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"
@@ skipping 23 matching lines @@
     // No TO_ state for METRO_SNAP, the windows implementation is synchronous.
     METRO_SNAP,
     TO_NORMAL,
     TO_FULLSCREEN,
   };
 
   FullscreenControllerTestWindow();
   ~FullscreenControllerTestWindow() override {}
 
   // BrowserWindow Interface:
-  void EnterFullscreen(const GURL& url,
-                       ExclusiveAccessBubbleType type,
-                       bool with_toolbar) override;
-  void ExitFullscreen() override;
   bool ShouldHideUIForFullscreen() const override;
   bool IsFullscreen() const override;
   bool SupportsFullscreenWithToolbar() const override;
   void UpdateFullscreenWithToolbar(bool with_toolbar) override;
   bool IsFullscreenWithToolbar() const override;
 #if defined(OS_WIN)
   void SetMetroSnapMode(bool enable) override;
   bool IsInMetroSnapMode() const override;
 #endif
   static const char* GetWindowStateString(WindowState state);
   WindowState state() const { return state_; }
   void set_browser(Browser* browser) { browser_ = browser; }
   ExclusiveAccessContext* GetExclusiveAccessContext() override;
 
   // ExclusiveAccessContext Interface:
   Profile* GetProfile() override;
   content::WebContents* GetActiveWebContents() override;
   void HideDownloadShelf() override;
   void UnhideDownloadShelf() override;
+  void EnterFullscreen(const GURL& url,
+                       ExclusiveAccessBubbleType type,
+                       bool with_toolbar) override;
+  void ExitFullscreen() override;

[Peter Kasting, 2015/12/03 04:39:11]

Also move the definitions of these functions to match the reordered
declarations.

   void UpdateExclusiveAccessExitBubbleContent(
       const GURL& url,
       ExclusiveAccessBubbleType bubble_type) override;
 
   // Simulates the window changing state.
   void ChangeWindowFullscreenState();
 
  private:
   // Enters fullscreen with |new_mac_with_toolbar_mode|.
   void EnterFullscreen(bool new_mac_with_toolbar_mode);
@@ skipping 156 matching lines @@
 void FullscreenControllerTestWindow::UnhideDownloadShelf() {
   GetDownloadShelf()->Unhide();
 }
 
 void FullscreenControllerTestWindow::HideDownloadShelf() {
   GetDownloadShelf()->Hide();
 }
 
 void FullscreenControllerTestWindow::UpdateExclusiveAccessExitBubbleContent(
     const GURL& url,
-    ExclusiveAccessBubbleType bubble_type) {
-  TestBrowserWindow::UpdateExclusiveAccessExitBubbleContent(url, bubble_type);
-}
+    ExclusiveAccessBubbleType bubble_type) {}
 
 // FullscreenControllerStateUnitTest -------------------------------------------
 
 // Unit test fixture testing Fullscreen Controller through its states. Most of
 // the test logic comes from FullscreenControllerStateTest.
 class FullscreenControllerStateUnitTest : public BrowserWithTestWindowTest,
                                           public FullscreenControllerStateTest {
  public:
   FullscreenControllerStateUnitTest();
 
@@ skipping 190 matching lines @@
       }
     }
   }
 
   output << "\n\nAll transitions:";
   output << GetStateTransitionsAsString();
   LOG(INFO) << output.str();
 }
 
 // Test that the fullscreen exit bubble is closed by
-// WindowFullscreenStateChanged() if fullscreen is exited via BrowserWindow.
-// This currently occurs when an extension exits fullscreen via changing the
-// browser bounds.
-TEST_F(FullscreenControllerStateUnitTest, ExitFullscreenViaBrowserWindow) {
+// WindowFullscreenStateChanged() if fullscreen is exited via the
+// ExclusiveAccessContext interface.
+TEST_F(FullscreenControllerStateUnitTest,
+       ExitFullscreenViaExclusiveAccessContext) {
   AddTab(browser(), GURL(url::kAboutBlankURL));
   ASSERT_TRUE(InvokeEvent(TOGGLE_FULLSCREEN));
   ASSERT_TRUE(InvokeEvent(WINDOW_CHANGE));
   ASSERT_TRUE(browser()->window()->IsFullscreen());
   // Exit fullscreen without going through fullscreen controller.
-  browser()->window()->ExitFullscreen();
+  window_->ExitFullscreen();
   ChangeWindowFullscreenState();
   EXPECT_EQ(EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE,
             browser()
                 ->exclusive_access_manager()
                 ->GetExclusiveAccessExitBubbleType());
 }
 
 // Test that switching tabs takes the browser out of tab fullscreen.
 TEST_F(FullscreenControllerStateUnitTest, ExitTabFullscreenViaSwitchingTab) {
   AddTab(browser(), GURL(url::kAboutBlankURL));
@@ skipping 351 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();
 }