| Index: chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc
|
| diff --git a/chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc
|
| index 148affd69f1c3109cfc351967da76e636a8f0735..9e352a3899990a6d0d4b87324b29cbdd35170531 100644
|
| --- a/chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc
|
| +++ b/chrome/browser/ui/exclusive_access/fullscreen_controller_state_unittest.cc
|
| @@ -6,6 +6,7 @@
|
| #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_controller_manager.h"
|
| #include "chrome/browser/ui/exclusive_access/fullscreen_controller.h"
|
| #include "chrome/browser/ui/exclusive_access/fullscreen_controller_state_test.h"
|
| #include "chrome/browser/ui/tabs/tab_strip_model.h"
|
| @@ -428,7 +429,9 @@ TEST_F(FullscreenControllerStateUnitTest, ExitFullscreenViaBrowserWindow) {
|
| browser()->window()->ExitFullscreen();
|
| ChangeWindowFullscreenState();
|
| EXPECT_EQ(EXCLUSIVE_ACCESS_BUBBLE_TYPE_NONE,
|
| - browser()->fullscreen_controller()->GetExclusiveAccessBubbleType());
|
| + browser()
|
| + ->GetExclusiveAccessControllerManager()
|
| + ->GetExclusiveAccessBubbleType());
|
| }
|
|
|
| // Test that switching tabs takes the browser out of tab fullscreen.
|
| @@ -763,8 +766,9 @@ TEST_F(FullscreenControllerStateUnitTest,
|
| EXPECT_TRUE(wc_delegate->IsFullscreenForTabOrPending(tab));
|
| EXPECT_TRUE(second_wc_delegate->IsFullscreenForTabOrPending(tab));
|
| EXPECT_FALSE(GetFullscreenController()->IsWindowFullscreenForTabOrPending());
|
| - EXPECT_FALSE(second_browser->fullscreen_controller()->
|
| - IsWindowFullscreenForTabOrPending());
|
| + EXPECT_FALSE(second_browser->GetExclusiveAccessControllerManager()
|
| + ->GetFullscreenController()
|
| + ->IsWindowFullscreenForTabOrPending());
|
|
|
| // Now, detach and reattach it back to the first browser window. Again, the
|
| // tab should remain in fullscreen mode and neither browser window should have
|
| @@ -777,8 +781,9 @@ TEST_F(FullscreenControllerStateUnitTest,
|
| EXPECT_TRUE(wc_delegate->IsFullscreenForTabOrPending(tab));
|
| EXPECT_TRUE(second_wc_delegate->IsFullscreenForTabOrPending(tab));
|
| EXPECT_FALSE(GetFullscreenController()->IsWindowFullscreenForTabOrPending());
|
| - EXPECT_FALSE(second_browser->fullscreen_controller()->
|
| - IsWindowFullscreenForTabOrPending());
|
| + EXPECT_FALSE(second_browser->GetExclusiveAccessControllerManager()
|
| + ->GetFullscreenController()
|
| + ->IsWindowFullscreenForTabOrPending());
|
|
|
| // Exit fullscreen.
|
| ASSERT_TRUE(InvokeEvent(TAB_FULLSCREEN_FALSE));
|
| @@ -786,8 +791,9 @@ TEST_F(FullscreenControllerStateUnitTest,
|
| EXPECT_FALSE(wc_delegate->IsFullscreenForTabOrPending(tab));
|
| EXPECT_FALSE(second_wc_delegate->IsFullscreenForTabOrPending(tab));
|
| EXPECT_FALSE(GetFullscreenController()->IsWindowFullscreenForTabOrPending());
|
| - EXPECT_FALSE(second_browser->fullscreen_controller()->
|
| - IsWindowFullscreenForTabOrPending());
|
| + EXPECT_FALSE(second_browser->GetExclusiveAccessControllerManager()
|
| + ->GetFullscreenController()
|
| + ->IsWindowFullscreenForTabOrPending());
|
|
|
| // Required tear-down specific to this test.
|
| second_browser->tab_strip_model()->CloseAllTabs();
|
|
|