| Index: chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc b/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc
|
| index 2970b7fb703cc91d33d7322610c46dbc56c19b9f..ec4a1a2015c24c3cf83cf9a3c4cd5f5aaba8b739 100644
|
| --- a/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc
|
| +++ b/chrome/browser/chromeos/login/lock/screen_locker_browsertest.cc
|
| @@ -13,6 +13,7 @@
|
| #include "chrome/browser/profiles/profile_manager.h"
|
| #include "chrome/browser/ui/browser.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"
|
| @@ -186,7 +187,10 @@ IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestFullscreenExit) {
|
| browser_window->GetNativeWindow());
|
| {
|
| Waiter waiter(browser());
|
| - browser()->fullscreen_controller()->ToggleBrowserFullscreenMode();
|
| + browser()
|
| + ->GetExclusiveAccessControllerManager()
|
| + ->GetFullscreenController()
|
| + ->ToggleBrowserFullscreenMode();
|
| waiter.Wait(false /* not locked */, true /* full screen */);
|
| EXPECT_TRUE(browser_window->IsFullscreen());
|
| EXPECT_FALSE(window_state->hide_shelf_when_fullscreen());
|
| @@ -209,7 +213,10 @@ IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestFullscreenExit) {
|
| EXPECT_FALSE(tester->IsLocked());
|
| {
|
| Waiter waiter(browser());
|
| - browser()->fullscreen_controller()->ToggleBrowserFullscreenMode();
|
| + browser()
|
| + ->GetExclusiveAccessControllerManager()
|
| + ->GetFullscreenController()
|
| + ->ToggleBrowserFullscreenMode();
|
| waiter.Wait(false /* not locked */, false /* fullscreen */);
|
| EXPECT_FALSE(browser_window->IsFullscreen());
|
| }
|
| @@ -221,8 +228,10 @@ IN_PROC_BROWSER_TEST_F(ScreenLockerTest, TestFullscreenExit) {
|
| Waiter waiter(browser());
|
| content::WebContents* web_contents =
|
| browser()->tab_strip_model()->GetActiveWebContents();
|
| - browser()->fullscreen_controller()->ToggleFullscreenModeForTab(
|
| - web_contents, true);
|
| + browser()
|
| + ->GetExclusiveAccessControllerManager()
|
| + ->GetFullscreenController()
|
| + ->ToggleFullscreenModeForTab(web_contents, true);
|
| waiter.Wait(false /* not locked */, true /* fullscreen */);
|
| EXPECT_TRUE(browser_window->IsFullscreen());
|
| EXPECT_TRUE(window_state->hide_shelf_when_fullscreen());
|
|
|