[cros] user_manager component - move UserManagerBase and UserManager

chrome/browser/chromeos/login/crash_restore_browsertest.cc

 // Copyright 2013 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 <vector>
 
 #include "base/command_line.h"
 #include "base/memory/ref_counted.h"
 #include "base/run_loop.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
-#include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/test/base/in_process_browser_test.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/cryptohome_client.h"
 #include "chromeos/dbus/fake_dbus_thread_manager.h"
 #include "chromeos/dbus/fake_session_manager_client.h"
 #include "chromeos/dbus/session_manager_client.h"
 #include "components/user_manager/user.h"
+#include "components/user_manager/user_manager.h"
 #include "content/public/test/test_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "third_party/cros_system_api/dbus/service_constants.h"
 
 namespace chromeos {
 
 namespace {
 
 const char kUserId1[] = "user1@example.com";
 const char kUserId2[] = "user2@example.com";
@@ skipping 22 matching lines @@
     dbus_thread_manager->SetSessionManagerClient(
         scoped_ptr<SessionManagerClient>(session_manager_client_));
     DBusThreadManager::SetInstanceForTesting(dbus_thread_manager);
     session_manager_client_->StartSession(kUserId1);
   }
 
   FakeSessionManagerClient* session_manager_client_;
 };
 
 IN_PROC_BROWSER_TEST_F(CrashRestoreSimpleTest, RestoreSessionForOneUser) {
-  UserManager* user_manager = UserManager::Get();
+  user_manager::UserManager* user_manager = user_manager::UserManager::Get();
   user_manager::User* user = user_manager->GetActiveUser();
   ASSERT_TRUE(user);
   EXPECT_EQ(kUserId1, user->email());
   EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId1),
             user->username_hash());
   EXPECT_EQ(1UL, user_manager->GetLoggedInUsers().size());
 }
 
 // Observer that keeps track of user sessions restore event.
 class UserSessionRestoreObserver : public UserSessionStateObserver {
@@ skipping 52 matching lines @@
 IN_PROC_BROWSER_TEST_F(CrashRestoreComplexTest, RestoreSessionForThreeUsers) {
   {
     UserSessionRestoreObserver restore_observer;
     restore_observer.Wait();
   }
 
   DCHECK(UserSessionManager::GetInstance()->UserSessionsRestored());
 
   // User that is last in the user sessions map becomes active. This behavior
   // will become better defined once each user gets a separate user desktop.
-  UserManager* user_manager = UserManager::Get();
+  user_manager::UserManager* user_manager = user_manager::UserManager::Get();
   user_manager::User* user = user_manager->GetActiveUser();
   ASSERT_TRUE(user);
   EXPECT_EQ(kUserId3, user->email());
   EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId3),
             user->username_hash());
   const user_manager::UserList& users = user_manager->GetLoggedInUsers();
   ASSERT_EQ(3UL, users.size());
 
   // User that becomes active moves to the beginning of the list.
   EXPECT_EQ(kUserId3, users[0]->email());
   EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId3),
             users[0]->username_hash());
   EXPECT_EQ(kUserId2, users[1]->email());
   EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId2),
             users[1]->username_hash());
   EXPECT_EQ(kUserId1, users[2]->email());
   EXPECT_EQ(CryptohomeClient::GetStubSanitizedUsername(kUserId1),
             users[2]->username_hash());
 }
 
 }  // namespace chromeos