mash: Migrate SessionStateDelegate access to WmShell.

chrome/browser/chromeos/login/ui/user_adding_screen_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 "ash/common/session/session_state_delegate.h"
-#include "ash/shell.h"
+#include "ash/common/wm_shell.h"
 #include "base/macros.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/lock/screen_locker.h"
 #include "chrome/browser/chromeos/login/lock/screen_locker_tester.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "components/prefs/pref_service.h"
 #include "components/user_manager/user_manager.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gtest/include/gtest/gtest.h"
+#include "ui/aura/window.h"
 
 using namespace testing;
 
 namespace {
 
 const char* const kTestUsers[] = {"test-user1@gmail.com",
                                   "test-user2@gmail.com",
                                   "test-user3@gmail.com"};
 
 }  // anonymous namespace
@@ skipping 68 matching lines @@
 IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, PRE_CancelAdding) {
   RegisterUser(kTestUsers[0]);
   RegisterUser(kTestUsers[1]);
   RegisterUser(kTestUsers[2]);
   StartupUtils::MarkOobeCompleted();
 }
 
 IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, CancelAdding) {
   EXPECT_EQ(3u, user_manager::UserManager::Get()->GetUsers().size());
   EXPECT_EQ(0u, user_manager::UserManager::Get()->GetLoggedInUsers().size());
-
   EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_LOGIN_PRIMARY,
-            ash::Shell::GetInstance()->session_state_delegate()->
-                GetSessionState());
+            ash::WmShell::Get()->GetSessionStateDelegate()->GetSessionState());
 
   LoginUser(kTestUsers[0]);
   EXPECT_EQ(1u, user_manager::UserManager::Get()->GetLoggedInUsers().size());
   EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_ACTIVE,
-            ash::Shell::GetInstance()->session_state_delegate()->
-                GetSessionState());
+            ash::WmShell::Get()->GetSessionStateDelegate()->GetSessionState());
 
   UserAddingScreen::Get()->Start();
   content::RunAllPendingInMessageLoop();
   EXPECT_EQ(1, user_adding_started());
   EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY,
-            ash::Shell::GetInstance()->session_state_delegate()->
-                GetSessionState());
+            ash::WmShell::Get()->GetSessionStateDelegate()->GetSessionState());
 
   UserAddingScreen::Get()->Cancel();
   WaitUntilUserAddingFinishedOrCancelled();
   content::RunAllPendingInMessageLoop();
   EXPECT_EQ(1, user_adding_finished());
   EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_ACTIVE,
-            ash::Shell::GetInstance()->session_state_delegate()->
-                GetSessionState());
+            ash::WmShell::Get()->GetSessionStateDelegate()->GetSessionState());
 
   EXPECT_TRUE(LoginDisplayHost::default_host() == nullptr);
   EXPECT_EQ(1u, user_manager::UserManager::Get()->GetLoggedInUsers().size());
   EXPECT_EQ(kTestUsers[0],
             user_manager::UserManager::Get()->GetActiveUser()->email());
 }
 
 IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, PRE_AddingSeveralUsers) {
   RegisterUser(kTestUsers[0]);
   RegisterUser(kTestUsers[1]);
   RegisterUser(kTestUsers[2]);
   StartupUtils::MarkOobeCompleted();
 }
 
 IN_PROC_BROWSER_TEST_F(UserAddingScreenTest, AddingSeveralUsers) {
+  ash::WmShell* wm_shell = ash::WmShell::Get();
   EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_LOGIN_PRIMARY,
-            ash::Shell::GetInstance()->session_state_delegate()->
-                GetSessionState());
+            wm_shell->GetSessionStateDelegate()->GetSessionState());
   LoginUser(kTestUsers[0]);
   EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_ACTIVE,
-            ash::Shell::GetInstance()->session_state_delegate()->
-                GetSessionState());
+            wm_shell->GetSessionStateDelegate()->GetSessionState());
 
   user_manager::UserManager* user_manager = user_manager::UserManager::Get();
 
   for (int i = 1; i < 3; ++i) {
     UserAddingScreen::Get()->Start();
     content::RunAllPendingInMessageLoop();
     EXPECT_EQ(i, user_adding_started());
     EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_LOGIN_SECONDARY,
-              ash::Shell::GetInstance()->session_state_delegate()->
-                  GetSessionState());
+              wm_shell->GetSessionStateDelegate()->GetSessionState());
     AddUser(kTestUsers[i]);
     WaitUntilUserAddingFinishedOrCancelled();
     content::RunAllPendingInMessageLoop();
     EXPECT_EQ(i, user_adding_finished());
     EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_ACTIVE,
-              ash::Shell::GetInstance()->session_state_delegate()->
-                  GetSessionState());
+              wm_shell->GetSessionStateDelegate()->GetSessionState());
     EXPECT_TRUE(LoginDisplayHost::default_host() == nullptr);
     ASSERT_EQ(unsigned(i + 1), user_manager->GetLoggedInUsers().size());
   }
 
   EXPECT_EQ(ash::SessionStateDelegate::SESSION_STATE_ACTIVE,
-            ash::Shell::GetInstance()->session_state_delegate()->
-                GetSessionState());
+            wm_shell->GetSessionStateDelegate()->GetSessionState());
 
   // Now check how unlock policy works for these users.
   PrefService* prefs1 =
       ProfileHelper::Get()
           ->GetProfileByUserUnsafe(user_manager->GetLoggedInUsers()[0])
           ->GetPrefs();
   PrefService* prefs2 =
       ProfileHelper::Get()
           ->GetProfileByUserUnsafe(user_manager->GetLoggedInUsers()[1])
           ->GetPrefs();
@@ skipping 90 matching lines @@
 
   UserAddingScreen::Get()->Start();
   content::RunAllPendingInMessageLoop();
   CheckScreenIsVisible();
   UserAddingScreen::Get()->Cancel();
   WaitUntilUserAddingFinishedOrCancelled();
   content::RunAllPendingInMessageLoop();
 }
 
 }  // namespace chromeos