cros: Move IsUserSupervised and IsUserChild off SystemTrayDelegate

ash/system/supervised/tray_supervised_user_unittest.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/system/supervised/tray_supervised_user.h"
 
 #include "ash/login_status.h"
-#include "ash/test/ash_test.h"
+#include "ash/public/interfaces/session_controller.mojom.h"
+#include "ash/session/session_controller.h"
+#include "ash/shell.h"
+#include "ash/test/ash_test_base.h"
+#include "ash/test/test_session_controller_client.h"
 #include "ash/test/test_system_tray_delegate.h"
 #include "ui/message_center/message_center.h"
 #include "ui/message_center/notification.h"
 #include "ui/message_center/notification_list.h"
 #include "ui/message_center/notification_types.h"
 
 using message_center::NotificationList;
 
 namespace ash {
 
-class TraySupervisedUserTest : public AshTest {
+// Tests handle creating their own sessions.
+class TraySupervisedUserTest : public test::NoSessionAshTestBase {
  public:
   TraySupervisedUserTest() {}
   ~TraySupervisedUserTest() override {}
 
  protected:
   message_center::Notification* GetPopup();
 
  private:
   DISALLOW_COPY_AND_ASSIGN(TraySupervisedUserTest);
 };
 
 message_center::Notification* TraySupervisedUserTest::GetPopup() {
   NotificationList::PopupNotifications popups =
       message_center::MessageCenter::Get()->GetPopupNotifications();
   for (NotificationList::PopupNotifications::const_iterator iter =
            popups.begin();
        iter != popups.end(); ++iter) {
     if ((*iter)->id() == TraySupervisedUser::kNotificationId)
       return *iter;
   }
   return NULL;
 }
 
-class TraySupervisedUserInitialTest : public TraySupervisedUserTest {
- public:
-  // Set the initial login status to supervised-user before AshTest::SetUp()
-  // constructs the system tray.
-  TraySupervisedUserInitialTest()
-      : scoped_initial_login_status_(LoginStatus::SUPERVISED) {}
-  ~TraySupervisedUserInitialTest() override {}
+// Verifies that when a supervised user logs in that a warning notification is
+// shown and ash does not crash.
+TEST_F(TraySupervisedUserTest, SupervisedUserHasNotification) {
+  ASSERT_EQ(LoginStatus::NOT_LOGGED_IN,
+            GetSystemTrayDelegate()->GetUserLoginStatus());

[xiyuan, 2017/04/19 20:58:00]

I would vote to merge GetUserLoginStatus with the
SessionController::login_status() in the future. WDYT?

[James Cook, 2017/04/19 22:16:37]

I think that's a good idea, but we need to eliminate ash::LoginStatus::OWNER,
because the two don't match for that case. Filed crbug.com/713380

+  ASSERT_FALSE(
+      Shell::Get()->session_controller()->IsActiveUserSessionStarted());
 
- private:
-  test::ScopedInitialLoginStatus scoped_initial_login_status_;
-
-  DISALLOW_COPY_AND_ASSIGN(TraySupervisedUserInitialTest);
-};
-
-TEST_F(TraySupervisedUserTest, SupervisedUserHasNotification) {
-  test::TestSystemTrayDelegate* delegate = GetSystemTrayDelegate();
-  delegate->SetLoginStatus(LoginStatus::SUPERVISED);
+  // Simulate a supervised user logging in.
+  test::TestSessionControllerClient* client = GetSessionControllerClient();
+  client->Reset();
+  mojom::UserSessionPtr session = mojom::UserSession::New();
+  session->session_id = 1;
+  session->type = user_manager::USER_TYPE_SUPERVISED;
+  Shell::Get()->session_controller()->UpdateUserSession(std::move(session));

[xiyuan, 2017/04/19 20:58:00]

Make TestSessionControllerClient::AddUserSession to take a user type  and use
that?

[James Cook, 2017/04/19 22:16:37]

Done.

+  client->SetSessionState(session_manager::SessionState::ACTIVE);
 
   message_center::Notification* notification = GetPopup();
   ASSERT_NE(static_cast<message_center::Notification*>(NULL), notification);
   EXPECT_EQ(static_cast<int>(message_center::SYSTEM_PRIORITY),
-            notification->rich_notification_data().priority);
-}
-
-TEST_F(TraySupervisedUserInitialTest, SupervisedUserNoCrash) {
-  // Initial login status is already SUPERVISED, which should create
-  // the notification and should not cause crashes.
-  message_center::Notification* notification = GetPopup();
-  ASSERT_NE(static_cast<message_center::Notification*>(NULL), notification);
-  EXPECT_EQ(static_cast<int>(message_center::SYSTEM_PRIORITY),
             notification->rich_notification_data().priority);
 }
 
 }  // namespace ash