[cros] user_manager component - move UserManagerBase and UserManager

chrome/browser/chromeos/login/supervised/supervised_user_password_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 <string>
 
 #include "base/compiler_specific.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/supervised/supervised_user_authentication.h"
 #include "chrome/browser/chromeos/login/supervised/supervised_user_test_base.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
 #include "chrome/browser/chromeos/login/ui/webui_login_view.h"
+#include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/supervised_user_manager.h"
 #include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"
 #include "chrome/browser/chromeos/settings/stub_cros_settings_provider.h"
 #include "chrome/browser/supervised_user/supervised_user_constants.h"
 #include "chrome/browser/supervised_user/supervised_user_registration_utility.h"
 #include "chrome/browser/supervised_user/supervised_user_registration_utility_stub.h"
 #include "chrome/browser/supervised_user/supervised_user_shared_settings_service.h"
 #include "chrome/browser/supervised_user/supervised_user_shared_settings_service_factory.h"
 #include "chrome/browser/supervised_user/supervised_user_sync_service.h"
 #include "chrome/browser/supervised_user/supervised_user_sync_service_factory.h"
@@ skipping 43 matching lines @@
   StartUserCreation("supervised-user-creation-next-button",
                     kTestSupervisedUserDisplayName);
 }
 
 // Supervised user signs in, get sync notification about password update, and
 // schedules password migration.
 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
                        DISABLED_PRE_PasswordChangeFromUserTest) {
   SigninAsSupervisedUser(true, 0, kTestSupervisedUserDisplayName);
 
-  const user_manager::User* user = UserManager::Get()->GetUsers().at(0);
+  const user_manager::User* user =
+      user_manager::UserManager::Get()->GetUsers().at(0);
   std::string sync_id =
-      UserManager::Get()->GetSupervisedUserManager()->GetUserSyncId(
+      ChromeUserManager::Get()->GetSupervisedUserManager()->GetUserSyncId(
           user->email());
   base::DictionaryValue password;
   password.SetIntegerWithoutPathExpansion(
       kSchemaVersion, SupervisedUserAuthentication::SCHEMA_SALT_HASHED);
   password.SetIntegerWithoutPathExpansion(kPasswordRevision, 2);
 
   password.SetStringWithoutPathExpansion(kPasswordSignature, "signature");
   password.SetStringWithoutPathExpansion(kEncryptedPassword,
                                          "new-encrypted-password");
 
@@ skipping 23 matching lines @@
   FillNewUserData(kTestSupervisedUserDisplayName);
   StartUserCreation("supervised-user-creation-next-button",
                     kTestSupervisedUserDisplayName);
 }
 
 // Manager signs in, gets sync notification about supervised user password
 // update, and performs migration.
 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
                        DISABLED_PRE_PasswordChangeFromManagerTest) {
   const user_manager::User* supervised_user =
-      UserManager::Get()->GetUsers().at(0);
+      user_manager::UserManager::Get()->GetUsers().at(0);
 
   SigninAsManager(1);
 
   EXPECT_CALL(*mock_homedir_methods_, AddKeyEx(_, _, _, _, _)).Times(1);
 
   std::string sync_id =
-      UserManager::Get()->GetSupervisedUserManager()->GetUserSyncId(
+      ChromeUserManager::Get()->GetSupervisedUserManager()->GetUserSyncId(
           supervised_user->email());
 
   ::sync_pb::ManagedUserSpecifics managed_user_proto;
 
   managed_user_proto.set_id(sync_id);
   managed_user_proto.set_name(kTestSupervisedUserDisplayName);
   managed_user_proto.set_acknowledged(true);
   managed_user_proto.set_master_key("master key");
   managed_user_proto.set_password_signature_key("signature_key");
   managed_user_proto.set_password_encryption_key("encryption_key");
@@ skipping 38 matching lines @@
   StartUserCreation("supervised-user-creation-next-button",
                     kTestSupervisedUserDisplayName);
 }
 
 // Supervised user signs in, get sync notification about password update, and
 // schedules password migration.
 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
                        DISABLED_PRE_PRE_PasswordChangeUserAndManagerTest) {
   SigninAsSupervisedUser(true, 0, kTestSupervisedUserDisplayName);
 
-  const user_manager::User* user = UserManager::Get()->GetUsers().at(0);
+  const user_manager::User* user =
+      user_manager::UserManager::Get()->GetUsers().at(0);
   std::string sync_id =
-      UserManager::Get()->GetSupervisedUserManager()->GetUserSyncId(
+      ChromeUserManager::Get()->GetSupervisedUserManager()->GetUserSyncId(
           user->email());
   base::DictionaryValue password;
   password.SetIntegerWithoutPathExpansion(
       kSchemaVersion, SupervisedUserAuthentication::SCHEMA_SALT_HASHED);
   password.SetIntegerWithoutPathExpansion(kPasswordRevision, 2);
 
   password.SetStringWithoutPathExpansion(kPasswordSignature, "signature");
   password.SetStringWithoutPathExpansion(kEncryptedPassword,
                                          "new-encrypted-password");
 
   shared_settings_adapter_->AddChange(
       sync_id, supervised_users::kChromeOSPasswordData, password, true, false);
   content::RunAllPendingInMessageLoop();
 }
 
 // After that manager signs in, and also detects password change. Manager
 // performs the migration.
 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
                        DISABLED_PRE_PasswordChangeUserAndManagerTest) {
   const user_manager::User* supervised_user =
-      UserManager::Get()->GetUsers().at(0);
+      user_manager::UserManager::Get()->GetUsers().at(0);
 
   SigninAsManager(1);
 
   EXPECT_CALL(*mock_homedir_methods_, AddKeyEx(_, _, _, _, _)).Times(1);
 
   std::string sync_id =
-      UserManager::Get()->GetSupervisedUserManager()->GetUserSyncId(
+      ChromeUserManager::Get()->GetSupervisedUserManager()->GetUserSyncId(
           supervised_user->email());
 
   ::sync_pb::ManagedUserSpecifics managed_user_proto;
 
   managed_user_proto.set_id(sync_id);
   managed_user_proto.set_name(kTestSupervisedUserDisplayName);
   managed_user_proto.set_acknowledged(true);
   managed_user_proto.set_master_key("master key");
   managed_user_proto.set_password_signature_key("signature_key");
   managed_user_proto.set_password_encryption_key("encryption_key");
@@ skipping 20 matching lines @@
 // should be attempted.
 IN_PROC_BROWSER_TEST_F(SupervisedUserPasswordTest,
                        DISABLED_PasswordChangeUserAndManagerTest) {
   EXPECT_CALL(*mock_homedir_methods_, MountEx(_, _, _, _)).Times(1);
   EXPECT_CALL(*mock_homedir_methods_, UpdateKeyEx(_, _, _, _, _)).Times(0);
   SigninAsSupervisedUser(false, 1, kTestSupervisedUserDisplayName);
   testing::Mock::VerifyAndClearExpectations(mock_homedir_methods_);
 }
 
 }  // namespace chromeos