Refactor fullscreen_controller.

chrome/browser/ui/exclusive_access/flash_fullscreen_interactive_browsertest.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 "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
 #include "chrome/browser/ui/browser.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/test/base/interactive_test_utils.h"
 #include "chrome/test/ppapi/ppapi_test.h"
 #include "content/public/browser/render_widget_host.h"
 #include "content/public/browser/render_widget_host_view.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/test/test_utils.h"
 #include "third_party/skia/include/core/SkColor.h"
 
@@ skipping 119 matching lines @@
             expected_in_fullscreen)))
       return false;
 
     if (expected_in_fullscreen) {
       if (!GetActiveWebContents()->GetFullscreenRenderWidgetHostView()) {
         ADD_FAILURE()
             << "WebContents should have a fullscreen RenderWidgetHostView.";
         return false;
       }
       EXPECT_EQ(GetActiveWebContents()->GetCapturerCount() > 0,
-                !browser()->fullscreen_controller()->
-                     IsWindowFullscreenForTabOrPending());
+                !browser()
+                     ->GetExclusiveAccessControllerManager()
+                     ->GetFullscreenController()
+                     ->IsWindowFullscreenForTabOrPending());
     }
 
     return true;
   }
 
   bool ObserveFlashHasFocus(content::WebContents* contents,
                             bool expected_to_have_focus) const {
     if (!RunLoopUntil(base::Bind(
             &FlashFullscreenInteractiveBrowserTest::IsObservingFlashHasFocus,
             base::Unretained(this),
@@ skipping 18 matching lines @@
   bool ObserveFlashFillColor(SkColor expected_color) const {
     return RunLoopUntil(base::Bind(
         &FlashFullscreenInteractiveBrowserTest::IsObservingFlashFillColor,
         base::Unretained(this),
         expected_color));
   }
 
  private:
   bool IsObservingTabInFullscreen(content::WebContents* contents,
                                   bool expected_in_fullscreen) const {
-    return expected_in_fullscreen == browser()->fullscreen_controller()->
-                                         IsFullscreenForTabOrPending(contents);
+    return expected_in_fullscreen ==
+           browser()
+               ->GetExclusiveAccessControllerManager()
+               ->GetFullscreenController()
+               ->IsFullscreenForTabOrPending(contents);
   }
 
   bool IsObservingFlashHasFocus(content::WebContents* contents,
                                 bool expected_to_have_focus) const {
     content::RenderWidgetHostView* const flash_fs_view =
         contents->GetFullscreenRenderWidgetHostView();
     const bool flash_has_focus = flash_fs_view && flash_fs_view->HasFocus();
     return flash_has_focus == expected_to_have_focus;
   }
 
@@ skipping 139 matching lines @@
   ASSERT_TRUE(ObserveFlashFillColor(SK_ColorRED));
   PressSpacebar();
   ASSERT_TRUE(ObserveFlashFillColor(SK_ColorBLUE));
 
   // Test that the Escape key is handled as an exit fullscreen command while the
   // Flash widget has the focus.
   EXPECT_TRUE(ObserveFlashHasFocus(first_tab_contents, true));
   PressEscape();
   EXPECT_TRUE(ObserveTabIsInFullscreen(false));
 }