cros: Merge SystemTrayDelegate::GetUserLoginStatus

ash/root_window_controller_unittest.cc

Index: ash/root_window_controller_unittest.cc
diff --git a/ash/root_window_controller_unittest.cc b/ash/root_window_controller_unittest.cc
index 3992e8d4f8b4da4f49f771b77ceaba080dc40bbe..c250f308b2f9a6e2283c922fd9eb0d373031e026 100644
--- a/ash/root_window_controller_unittest.cc
+++ b/ash/root_window_controller_unittest.cc
@@ -11,7 +11,6 @@
 #include "ash/session/session_controller.h"
 #include "ash/shell.h"
 #include "ash/shell_port.h"
-#include "ash/system/tray/system_tray_delegate.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_session_controller_client.h"
 #include "ash/wm/system_modal_container_layout_manager.h"
@@ -388,7 +387,7 @@ TEST_F(RootWindowControllerTest, ModalContainer) {
   RootWindowController* controller =
       ShellPort::Get()->GetPrimaryRootWindowController();
   EXPECT_EQ(LoginStatus::USER,
-            Shell::Get()->system_tray_delegate()->GetUserLoginStatus());
+            Shell::Get()->session_controller()->login_status());

[James Cook, 2017/05/05 17:51:53]

How about switching some of these to their non-LoginStatus equivalents, like
IsActiveUserSessionStarted() or IsScreenLocked()?

Isn't the long-term plan to get rid of LoginStatus?

[xiyuan, 2017/05/05 18:36:33]

Right. Replaced LoginStatus with SessionController calls here an other places. I
was lazy and just doing mechanical changes. :)

   EXPECT_EQ(GetLayoutManager(controller, kShellWindowId_SystemModalContainer),
             controller->GetSystemModalLayoutManager(NULL));
 
@@ -400,7 +399,7 @@ TEST_F(RootWindowControllerTest, ModalContainer) {
 
   Shell::Get()->session_controller()->LockScreenAndFlushForTest();
   EXPECT_EQ(LoginStatus::LOCKED,
-            Shell::Get()->system_tray_delegate()->GetUserLoginStatus());
+            Shell::Get()->session_controller()->login_status());
   EXPECT_EQ(
       GetLayoutManager(controller, kShellWindowId_LockSystemModalContainer),
       controller->GetSystemModalLayoutManager(nullptr));
@@ -426,8 +425,7 @@ TEST_F(RootWindowControllerTest, ModalContainerNotLoggedInLoggedIn) {
   // Configure login screen environment.
   SessionController* session_controller = Shell::Get()->session_controller();
   SetUserLoggedIn(false);
-  EXPECT_EQ(LoginStatus::NOT_LOGGED_IN,
-            Shell::Get()->system_tray_delegate()->GetUserLoginStatus());
+  EXPECT_EQ(LoginStatus::NOT_LOGGED_IN, session_controller->login_status());
   EXPECT_EQ(0, session_controller->NumberOfLoggedInUsers());
   EXPECT_FALSE(session_controller->IsActiveUserSessionStarted());
 
@@ -450,8 +448,7 @@ TEST_F(RootWindowControllerTest, ModalContainerNotLoggedInLoggedIn) {
   // Configure user session environment.
   SetUserLoggedIn(true);
   SetSessionStarted(true);
-  EXPECT_EQ(LoginStatus::USER,
-            Shell::Get()->system_tray_delegate()->GetUserLoginStatus());
+  EXPECT_EQ(LoginStatus::USER, session_controller->login_status());

[James Cook, 2017/05/05 17:51:53]

nit: could remove this one

[xiyuan, 2017/05/05 18:36:33]

Done.

   EXPECT_EQ(1, session_controller->NumberOfLoggedInUsers());
   EXPECT_TRUE(session_controller->IsActiveUserSessionStarted());
   EXPECT_EQ(GetLayoutManager(controller, kShellWindowId_SystemModalContainer),