[cros] Move User class to user_manager component.

chrome/browser/chromeos/login/signin/oauth2_browsertest.cc

Index: chrome/browser/chromeos/login/signin/oauth2_browsertest.cc
diff --git a/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc b/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc
index 45da4ccc8be15cb4eb892e5ac7ec14542ed36690..00677ecb2a4343e539e5694502374c142fff912f 100644
--- a/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc
+++ b/chrome/browser/chromeos/login/signin/oauth2_browsertest.cc
@@ -14,7 +14,6 @@
 #include "chrome/browser/chromeos/login/signin/oauth2_login_manager_factory.h"
 #include "chrome/browser/chromeos/login/signin_specifics.h"
 #include "chrome/browser/chromeos/login/test/oobe_base_test.h"
-#include "chrome/browser/chromeos/login/users/user.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
 #include "chrome/browser/extensions/extension_test_message_listener.h"
@@ -31,6 +30,7 @@
 #include "chromeos/login/auth/key.h"
 #include "chromeos/login/auth/user_context.h"
 #include "components/signin/core/browser/profile_oauth2_token_service.h"
+#include "components/user_manager/user.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/browser_test_utils.h"
 #include "extensions/browser/process_manager.h"
@@ -169,7 +169,7 @@ class OAuth2Test : public OobeBaseTest {
     JsExpect("!!document.querySelector('#pod-row')");
 
     EXPECT_EQ(GetOAuthStatusFromLocalState(kTestAccountId),
-              User::OAUTH2_TOKEN_STATUS_VALID);
+              user_manager::User::OAUTH2_TOKEN_STATUS_VALID);
 
     EXPECT_TRUE(TryToLogin(kTestAccountId, kTestAccountPassword));
     Profile* profile = ProfileManager::GetPrimaryUserProfile();
@@ -183,7 +183,7 @@ class OAuth2Test : public OobeBaseTest {
     EXPECT_TRUE(token_service->RefreshTokenIsAvailable(kTestAccountId));
 
     EXPECT_EQ(GetOAuthStatusFromLocalState(kTestAccountId),
-              User::OAUTH2_TOKEN_STATUS_VALID);
+              user_manager::User::OAUTH2_TOKEN_STATUS_VALID);
   }
 
   bool TryToLogin(const std::string& username,
@@ -191,26 +191,27 @@ class OAuth2Test : public OobeBaseTest {
     if (!AddUserToSession(username, password))
       return false;
 
-    if (const User* active_user = UserManager::Get()->GetActiveUser())
+    if (const user_manager::User* active_user =
+            UserManager::Get()->GetActiveUser())
       return active_user->email() == username;
 
     return false;
   }
 
-  User::OAuthTokenStatus GetOAuthStatusFromLocalState(
+  user_manager::User::OAuthTokenStatus GetOAuthStatusFromLocalState(
       const std::string& user_id) const {
     PrefService* local_state = g_browser_process->local_state();
     const base::DictionaryValue* prefs_oauth_status =
         local_state->GetDictionary("OAuthTokenStatus");
-    int oauth_token_status = User::OAUTH_TOKEN_STATUS_UNKNOWN;
+    int oauth_token_status = user_manager::User::OAUTH_TOKEN_STATUS_UNKNOWN;
     if (prefs_oauth_status &&
         prefs_oauth_status->GetIntegerWithoutPathExpansion(
             user_id, &oauth_token_status)) {
-      User::OAuthTokenStatus result =
-          static_cast<User::OAuthTokenStatus>(oauth_token_status);
+      user_manager::User::OAuthTokenStatus result =
+          static_cast<user_manager::User::OAuthTokenStatus>(oauth_token_status);
       return result;
     }
-    return User::OAUTH_TOKEN_STATUS_UNKNOWN;
+    return user_manager::User::OAUTH_TOKEN_STATUS_UNKNOWN;
   }
 
  protected:
@@ -237,9 +238,11 @@ class OAuth2Test : public OobeBaseTest {
     content::WindowedNotificationObserver(
         chrome::NOTIFICATION_SESSION_STARTED,
         content::NotificationService::AllSources()).Wait();
-    const UserList& logged_users = UserManager::Get()->GetLoggedInUsers();
-    for (UserList::const_iterator it = logged_users.begin();
-         it != logged_users.end(); ++it) {
+    const user_manager::UserList& logged_users =
+        UserManager::Get()->GetLoggedInUsers();
+    for (user_manager::UserList::const_iterator it = logged_users.begin();
+         it != logged_users.end();
+         ++it) {
       if ((*it)->email() == username)
         return true;
     }
@@ -407,7 +410,7 @@ IN_PROC_BROWSER_TEST_F(OAuth2Test, PRE_PRE_PRE_MergeSession) {
   EXPECT_TRUE(token_service->RefreshTokenIsAvailable(kTestAccountId));
 
   EXPECT_EQ(GetOAuthStatusFromLocalState(kTestAccountId),
-            User::OAUTH2_TOKEN_STATUS_VALID);
+            user_manager::User::OAUTH2_TOKEN_STATUS_VALID);
 
   scoped_refptr<CookieReader> cookie_reader(new CookieReader());
   cookie_reader->ReadCookies(profile());
@@ -460,7 +463,7 @@ IN_PROC_BROWSER_TEST_F(OAuth2Test, MergeSession) {
   JsExpect("!!document.querySelector('#pod-row')");
 
   EXPECT_EQ(GetOAuthStatusFromLocalState(kTestAccountId),
-            User::OAUTH2_TOKEN_STATUS_VALID);
+            user_manager::User::OAUTH2_TOKEN_STATUS_VALID);
 
   EXPECT_TRUE(TryToLogin(kTestAccountId, kTestAccountPassword));
 
@@ -468,7 +471,7 @@ IN_PROC_BROWSER_TEST_F(OAuth2Test, MergeSession) {
   WaitForMergeSessionCompletion(OAuth2LoginManager::SESSION_RESTORE_FAILED);
 
   EXPECT_EQ(GetOAuthStatusFromLocalState(kTestAccountId),
-            User::OAUTH2_TOKEN_STATUS_INVALID);
+            user_manager::User::OAUTH2_TOKEN_STATUS_INVALID);
 }