browser: Remove fullscreen functions and have callers call FullscreenController directly.

chrome/browser/ui/fullscreen/fullscreen_controller_test.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 "chrome/browser/ui/fullscreen/fullscreen_controller_test.h"
 
 #include "base/command_line.h"
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_tabstrip.h"
@@ skipping 27 matching lines @@
 // that when running serially there is no flakiness in the transition.
 void FullscreenControllerTest::ToggleTabFullscreenNoRetries(
     bool enter_fullscreen) {
   ToggleTabFullscreen_Internal(enter_fullscreen, false);
 }
 
 void FullscreenControllerTest::ToggleBrowserFullscreen(bool enter_fullscreen) {
   ASSERT_EQ(browser()->window()->IsFullscreen(), !enter_fullscreen);
   FullscreenNotificationObserver fullscreen_observer;
 
-  browser()->ToggleFullscreenMode();
+  chrome::ToggleFullscreenMode(browser());
 
   fullscreen_observer.Wait();
   ASSERT_EQ(browser()->window()->IsFullscreen(), enter_fullscreen);
   ASSERT_EQ(IsFullscreenForBrowser(), enter_fullscreen);
 }
 
 void FullscreenControllerTest::RequestToLockMouse(
     bool user_gesture,
     bool last_unlocked_by_target) {
   WebContents* tab = chrome::GetActiveWebContents(browser());
   browser()->RequestToLockMouse(tab, user_gesture,
       last_unlocked_by_target);
 }
 
 void FullscreenControllerTest::LostMouseLock() {
   browser()->LostMouseLock();
 }
 
 bool FullscreenControllerTest::SendEscapeToFullscreenController() {
-  return browser()->fullscreen_controller_->HandleUserPressedEscape();
+  return browser()->fullscreen_controller()->HandleUserPressedEscape();
 }
 
 bool FullscreenControllerTest::IsFullscreenForBrowser() {
-  return browser()->fullscreen_controller_->IsFullscreenForBrowser();
+  return browser()->fullscreen_controller()->IsFullscreenForBrowser();
 }
 
 bool FullscreenControllerTest::IsFullscreenForTabOrPending() {
-  return browser()->IsFullscreenForTabOrPending();
+  return browser()->fullscreen_controller()->IsFullscreenForTabOrPending();
 }
 
 bool FullscreenControllerTest::IsMouseLockPermissionRequested() {
   FullscreenExitBubbleType type =
-      browser()->fullscreen_controller_->GetFullscreenExitBubbleType();
+      browser()->fullscreen_controller()->GetFullscreenExitBubbleType();
   bool mouse_lock = false;
   fullscreen_bubble::PermissionRequestedByType(type, NULL, &mouse_lock);
   return mouse_lock;
 }
 
 bool FullscreenControllerTest::IsFullscreenPermissionRequested() {
   FullscreenExitBubbleType type =
-      browser()->fullscreen_controller_->GetFullscreenExitBubbleType();
+      browser()->fullscreen_controller()->GetFullscreenExitBubbleType();
   bool fullscreen = false;
   fullscreen_bubble::PermissionRequestedByType(type, &fullscreen, NULL);
   return fullscreen;
 }
 
 FullscreenExitBubbleType
     FullscreenControllerTest::GetFullscreenExitBubbleType() {
-  return browser()->fullscreen_controller_->GetFullscreenExitBubbleType();
+  return browser()->fullscreen_controller()->GetFullscreenExitBubbleType();
 }
 
 bool FullscreenControllerTest::IsFullscreenBubbleDisplayed() {
   FullscreenExitBubbleType type =
-      browser()->fullscreen_controller_->GetFullscreenExitBubbleType();
+      browser()->fullscreen_controller()->GetFullscreenExitBubbleType();
   return type != FEB_TYPE_NONE;
 }
 
 bool FullscreenControllerTest::IsFullscreenBubbleDisplayingButtons() {
   FullscreenExitBubbleType type =
-      browser()->fullscreen_controller_->GetFullscreenExitBubbleType();
+      browser()->fullscreen_controller()->GetFullscreenExitBubbleType();
   return fullscreen_bubble::ShowButtonsForType(type);
 }
 
 void FullscreenControllerTest::AcceptCurrentFullscreenOrMouseLockRequest() {
   WebContents* fullscreen_tab = chrome::GetActiveWebContents(browser());
   FullscreenExitBubbleType type =
-      browser()->fullscreen_controller_->GetFullscreenExitBubbleType();
-  browser()->OnAcceptFullscreenPermission(fullscreen_tab->GetURL(), type);
+      browser()->fullscreen_controller()->GetFullscreenExitBubbleType();
+  browser()->fullscreen_controller()->OnAcceptFullscreenPermission(
+      fullscreen_tab->GetURL(), type);
 }
 
 void FullscreenControllerTest::DenyCurrentFullscreenOrMouseLockRequest() {
   FullscreenExitBubbleType type =
-      browser()->fullscreen_controller_->GetFullscreenExitBubbleType();
-  browser()->OnDenyFullscreenPermission(type);
+      browser()->fullscreen_controller()->GetFullscreenExitBubbleType();
+  browser()->fullscreen_controller()->OnDenyFullscreenPermission(type);
 }
 
 void FullscreenControllerTest::AddTabAtIndexAndWait(int index, const GURL& url,
     content::PageTransition transition) {
   content::TestNavigationObserver observer(
       content::NotificationService::AllSources(), NULL, 1);
 
   AddTabAtIndex(index, url, transition);
 
   observer.Wait();
@@ skipping 31 matching lines @@
       browser()->ToggleFullscreenModeForTab(tab, enter_fullscreen);
       fullscreen_observer.Wait();
       // Repeat ToggleFullscreenModeForTab until the correct state is entered.
       // This addresses flakiness on test bots running many fullscreen
       // tests in parallel.
     } while (retry_until_success &&
              browser()->window()->IsFullscreen() != enter_fullscreen);
     ASSERT_EQ(browser()->window()->IsFullscreen(), enter_fullscreen);
   }
 }