| Index: chrome/browser/ui/exclusive_access/flash_fullscreen_interactive_browsertest.cc
|
| diff --git a/chrome/browser/ui/exclusive_access/flash_fullscreen_interactive_browsertest.cc b/chrome/browser/ui/exclusive_access/flash_fullscreen_interactive_browsertest.cc
|
| index 7102b0e0ce9f11f6cb006018c83e974bebfe68e6..216a4033e4f5cfd6db7b02dff062d906f37c9d72 100644
|
| --- a/chrome/browser/ui/exclusive_access/flash_fullscreen_interactive_browsertest.cc
|
| +++ b/chrome/browser/ui/exclusive_access/flash_fullscreen_interactive_browsertest.cc
|
| @@ -8,6 +8,7 @@
|
| #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"
|
| @@ -147,8 +148,10 @@ class FlashFullscreenInteractiveBrowserTest : public OutOfProcessPPAPITest {
|
| return false;
|
| }
|
| EXPECT_EQ(GetActiveWebContents()->GetCapturerCount() > 0,
|
| - !browser()->fullscreen_controller()->
|
| - IsWindowFullscreenForTabOrPending());
|
| + !browser()
|
| + ->GetExclusiveAccessControllerManager()
|
| + ->GetFullscreenController()
|
| + ->IsWindowFullscreenForTabOrPending());
|
| }
|
|
|
| return true;
|
| @@ -187,8 +190,11 @@ class FlashFullscreenInteractiveBrowserTest : public OutOfProcessPPAPITest {
|
| 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,
|
|
|