cros: Move IsUserSupervised and IsUserChild off SystemTrayDelegate

ash/system/tiles/tray_tiles_unittest.cc

 // Copyright 2016 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/tiles/tray_tiles.h"
 
 #include "ash/system/tiles/tiles_default_view.h"
 #include "ash/test/ash_test_base.h"
 #include "ash/test/test_session_controller_client.h"
+#include "components/user_manager/user_type.h"
 #include "ui/views/controls/button/custom_button.h"
 #include "ui/views/view.h"
 
 using views::Button;
 
 namespace ash {
 
 // Tests manually control their session state.
 class TrayTilesTest : public test::NoSessionAshTestBase {
  public:
@@ skipping 72 matching lines @@
   std::unique_ptr<views::View> default_view(
       tray_tiles()->CreateDefaultViewForTesting());
   EXPECT_EQ(Button::STATE_DISABLED, GetSettingsButton()->state());
   EXPECT_EQ(Button::STATE_DISABLED, GetHelpButton()->state());
   EXPECT_EQ(Button::STATE_DISABLED, GetLockButton()->state());
   EXPECT_EQ(Button::STATE_NORMAL, GetPowerButton()->state());
 }
 
 // Settings buttons are disabled when adding a supervised user.
 TEST_F(TrayTilesTest, ButtonStatesSupervisedUserFlow) {
-  // Simulate a supervised user session with disabled settings.
+  // Simulate the add supervised user flow, which is a regular user session but
+  // with web UI settings disabled.
   const bool enable_settings = false;
-  GetSessionControllerClient()->AddUserSession("foo@example.com",
-                                               enable_settings);
+  GetSessionControllerClient()->AddUserSession(
+      "foo@example.com", user_manager::USER_TYPE_REGULAR, enable_settings);
   std::unique_ptr<views::View> default_view(
       tray_tiles()->CreateDefaultViewForTesting());
   EXPECT_EQ(Button::STATE_DISABLED, GetSettingsButton()->state());
   EXPECT_EQ(Button::STATE_DISABLED, GetHelpButton()->state());
   EXPECT_EQ(Button::STATE_DISABLED, GetLockButton()->state());
   EXPECT_EQ(Button::STATE_NORMAL, GetPowerButton()->state());
 }
 
 }  // namespace ash