cros: Remove supervised user methods from SystemTrayDelegate

chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc

 // Copyright 2015 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 "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 
 #include <set>
 
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 85 matching lines @@
 user_manager::User* FakeChromeUserManager::AddArcKioskAppUser(
     const AccountId& account_id) {
   user_manager::User* user =
       user_manager::User::CreateArcKioskAppUser(account_id);
   user->set_username_hash(ProfileHelper::GetUserIdHashByUserIdForTesting(
       account_id.GetUserEmail()));
   users_.push_back(user);
   return user;
 }
 
+user_manager::User* FakeChromeUserManager::AddSupervisedUser(
+    const AccountId& account_id) {
+  user_manager::User* user =
+      user_manager::User::CreateSupervisedUser(account_id);
+  user->set_username_hash(ProfileHelper::GetUserIdHashByUserIdForTesting(
+      account_id.GetUserEmail()));
+  users_.push_back(user);
+  return user;
+}
+
 const user_manager::User* FakeChromeUserManager::AddPublicAccountUser(
     const AccountId& account_id) {
   user_manager::User* user =
       user_manager::User::CreatePublicAccountUser(account_id);
   user->set_username_hash(ProfileHelper::GetUserIdHashByUserIdForTesting(
       account_id.GetUserEmail()));
   user->SetStubImage(base::MakeUnique<user_manager::UserImage>(
                          *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
                              IDR_PROFILE_PICTURE_LOADING)),
                      user_manager::User::USER_IMAGE_PROFILE, false);
   users_.push_back(user);
   chromeos::ProfileHelper::Get()->SetProfileToUserMappingForTesting(user);
   return user;
 }
 
 bool FakeChromeUserManager::AreEphemeralUsersEnabled() const {
   return fake_ephemeral_users_enabled_;
 }
 
-void FakeChromeUserManager::LoginUser(const AccountId& account_id) {
+void FakeChromeUserManager::LoginUser(const AccountId& account_id,
+                                      bool set_profile_created) {
   UserLoggedIn(account_id, ProfileHelper::GetUserIdHashByUserIdForTesting(
                                account_id.GetUserEmail()),
                false /* browser_restart */);
+
+  // NOTE: This does not match production. See function comment.
+  if (set_profile_created) {
+    for (auto* user : users_) {
+      if (user->GetAccountId() == account_id)
+        user->set_profile_is_created();

[xiyuan, 2017/04/21 23:14:35]

break; ?

[James Cook, 2017/04/24 17:47:26]

Done.

+    }
+  }
 }
 
 BootstrapManager* FakeChromeUserManager::GetBootstrapManager() {
   return bootstrap_manager_;
 }
 
 MultiProfileUserController*
 FakeChromeUserManager::GetMultiProfileUserController() {
   return multi_profile_user_controller_;
 }
@@ skipping 224 matching lines @@
 user_manager::UserList FakeChromeUserManager::GetUnlockUsers() const {
   return users_;
 }
 
 void FakeChromeUserManager::UserLoggedIn(const AccountId& account_id,
                                          const std::string& username_hash,
                                          bool browser_restart) {
   for (auto* user : users_) {
     if (user->username_hash() == username_hash) {
       user->set_is_logged_in(true);
-      user->set_profile_is_created();
       logged_in_users_.push_back(user);
 
       if (!primary_user_)
         primary_user_ = user;
       break;
     }
   }
+  // TODO(jamescook): This should set active_user_ and call NotifyOnLogin().
 }
 
 void FakeChromeUserManager::SwitchToLastActiveUser() {
   NOTREACHED();
 }
 
 bool FakeChromeUserManager::IsKnownUser(const AccountId& account_id) const {
   return true;
 }
 
@@ skipping 240 matching lines @@
   if (active_account_id_.is_valid()) {
     for (auto* user : users_) {
       if (user->GetAccountId() == active_account_id_)
         return user;
     }
   }
   return users_[0];
 }
 
 }  // namespace chromeos