Refactor fullscreen_controller.

chrome/browser/ui/exclusive_access/fullscreen_controller_test.cc

Index: chrome/browser/ui/exclusive_access/fullscreen_controller_test.cc
diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller_test.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller_test.cc
index bf1925f153818215a7463d41469d0c489bba59cc..88b8ac2fa30ed931a86b69c7c802a1f8d75db5e9 100644
--- a/chrome/browser/ui/exclusive_access/fullscreen_controller_test.cc
+++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_test.cc
@@ -8,6 +8,7 @@
 #include "chrome/browser/ui/browser.h"
 #include "chrome/browser/ui/browser_commands.h"
 #include "chrome/browser/ui/browser_window.h"
+#include "chrome/browser/ui/exclusive_access/exclusive_access_controller_manager.h"
 #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
 #include "chrome/browser/ui/tabs/tab_strip_model.h"
 #include "chrome/common/chrome_switches.h"
@@ -27,34 +28,35 @@ void FullscreenControllerTest::RequestToLockMouse(
       last_unlocked_by_target);
 }
 
+FullscreenController* FullscreenControllerTest::GetFullscreenController() {
+  browser()->GetExclusiveAccessControllerManager()->GetFullscreenController();
+}
+
 void FullscreenControllerTest::LostMouseLock() {
   browser()->LostMouseLock();
 }
 
 bool FullscreenControllerTest::SendEscapeToFullscreenController() {
-  return browser()->fullscreen_controller()->HandleUserPressedEscape();
+  return GetFullscreenController()->HandleUserPressedEscape();
 }
 
 bool FullscreenControllerTest::IsFullscreenForBrowser() {
-  return browser()->fullscreen_controller()->IsFullscreenForBrowser();
+  return GetFullscreenController()->IsFullscreenForBrowser();
 }
 
 bool FullscreenControllerTest::IsWindowFullscreenForTabOrPending() {
-  return browser()->fullscreen_controller()->
-      IsWindowFullscreenForTabOrPending();
+  return GetFullscreenController()->IsWindowFullscreenForTabOrPending();
 }
 
 bool FullscreenControllerTest::IsMouseLockPermissionRequested() {
-  ExclusiveAccessBubbleType type =
-      browser()->fullscreen_controller()->GetExclusiveAccessBubbleType();
+  ExclusiveAccessBubbleType type = GetExclusiveAccessBubbleType();
   bool mouse_lock = false;
   exclusive_access_bubble::PermissionRequestedByType(type, NULL, &mouse_lock);
   return mouse_lock;
 }
 
 bool FullscreenControllerTest::IsFullscreenPermissionRequested() {
-  ExclusiveAccessBubbleType type =
-      browser()->fullscreen_controller()->GetExclusiveAccessBubbleType();
+  ExclusiveAccessBubbleType type = GetExclusiveAccessBubbleType();
   bool fullscreen = false;
   exclusive_access_bubble::PermissionRequestedByType(type, &fullscreen, NULL);
   return fullscreen;
@@ -62,27 +64,30 @@ bool FullscreenControllerTest::IsFullscreenPermissionRequested() {
 
 ExclusiveAccessBubbleType
 FullscreenControllerTest::GetExclusiveAccessBubbleType() {
-  return browser()->fullscreen_controller()->GetExclusiveAccessBubbleType();
+  return browser()
+      ->GetExclusiveAccessControllerManager()
+      ->GetExclusiveAccessBubbleType();
 }
 
 bool FullscreenControllerTest::IsFullscreenBubbleDisplayed() {
-  ExclusiveAccessBubbleType type =
-      browser()->fullscreen_controller()->GetExclusiveAccessBubbleType();
-  return type != EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE;
+  return GetExclusiveAccessBubbleType() != EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE;
 }
 
 bool FullscreenControllerTest::IsFullscreenBubbleDisplayingButtons() {
-  ExclusiveAccessBubbleType type =
-      browser()->fullscreen_controller()->GetExclusiveAccessBubbleType();
-  return exclusive_access_bubble::ShowButtonsForType(type);
+  return exclusive_access_bubble::ShowButtonsForType(
+      GetExclusiveAccessBubbleType());
 }
 
 void FullscreenControllerTest::AcceptCurrentFullscreenOrMouseLockRequest() {
-  browser()->fullscreen_controller()->OnAcceptFullscreenPermission();
+  browser()
+      ->GetExclusiveAccessControllerManager()
+      ->OnAcceptFullscreenPermission();
 }
 
 void FullscreenControllerTest::DenyCurrentFullscreenOrMouseLockRequest() {
-  browser()->fullscreen_controller()->OnDenyFullscreenPermission();
+  browser()
+      ->GetExclusiveAccessControllerManager()
+      ->OnDenyFullscreenPermission();
 }
 
 void FullscreenControllerTest::GoBack() {
@@ -100,6 +105,5 @@ void FullscreenControllerTest::Reload() {
 }
 
 void FullscreenControllerTest::SetPrivilegedFullscreen(bool is_privileged) {
-  browser()->fullscreen_controller()->
-      SetPrivilegedFullscreenForTesting(is_privileged);
+  GetFullscreenController()->SetPrivilegedFullscreenForTesting(is_privileged);
 }