| Index: chrome/browser/chromeos/login/session_login_browsertest.cc
|
| diff --git a/chrome/browser/chromeos/login/session_login_browsertest.cc b/chrome/browser/chromeos/login/session_login_browsertest.cc
|
| index 5fac8db9add7e1f7a9ba5846624913fdcf0f9118..6f75f5b7f3105357cdf216e1b033c8db75e0ed12 100644
|
| --- a/chrome/browser/chromeos/login/session_login_browsertest.cc
|
| +++ b/chrome/browser/chromeos/login/session_login_browsertest.cc
|
| @@ -2,8 +2,6 @@
|
| // Use of this source code is governed by a BSD-style license that can be
|
| // found in the LICENSE file.
|
|
|
| -#include "ash/common/session/session_state_delegate.h"
|
| -#include "ash/common/wm_shell.h"
|
| #include "base/command_line.h"
|
| #include "chrome/browser/chromeos/login/login_manager_test.h"
|
| #include "chrome/browser/chromeos/login/startup_utils.h"
|
| @@ -13,6 +11,7 @@
|
| #include "chrome/browser/ui/browser_window.h"
|
| #include "chrome/browser/ui/view_ids.h"
|
| #include "chrome/common/chrome_switches.h"
|
| +#include "components/session_manager/core/session_manager.h"
|
| #include "testing/gtest/include/gtest/gtest.h"
|
| #include "ui/views/focus/focus_manager.h"
|
| #include "ui/views/view.h"
|
| @@ -39,17 +38,17 @@ class BrowserLoginTest : public chromeos::LoginManagerTest {
|
|
|
| IN_PROC_BROWSER_TEST_F(BrowserLoginTest, PRE_BrowserActive) {
|
| RegisterUser(kTestUser);
|
| - EXPECT_EQ(session_manager::SessionState::LOGIN_PRIMARY,
|
| - ash::WmShell::Get()->GetSessionStateDelegate()->GetSessionState());
|
| + EXPECT_EQ(session_manager::SessionState::OOBE,
|
| + session_manager::SessionManager::Get()->session_state());
|
| chromeos::StartupUtils::MarkOobeCompleted();
|
| }
|
|
|
| IN_PROC_BROWSER_TEST_F(BrowserLoginTest, BrowserActive) {
|
| EXPECT_EQ(session_manager::SessionState::LOGIN_PRIMARY,
|
| - ash::WmShell::Get()->GetSessionStateDelegate()->GetSessionState());
|
| + session_manager::SessionManager::Get()->session_state());
|
| LoginUser(kTestUser);
|
| EXPECT_EQ(session_manager::SessionState::ACTIVE,
|
| - ash::WmShell::Get()->GetSessionStateDelegate()->GetSessionState());
|
| + session_manager::SessionManager::Get()->session_state());
|
|
|
| Browser* browser =
|
| chrome::FindAnyBrowser(ProfileManager::GetActiveUserProfile(), false);
|
|
|