[cros] Move User class to user_manager component.

chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc

Index: chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc
diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc
index fd051919e83221c3c123078db8e65122344b3bee..88fe5811bdb1fdf3086ae9194add5033074e58d0 100644
--- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc
+++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_policy_browsertest.cc
@@ -20,7 +20,6 @@
 #include "chrome/browser/chromeos/login/login_manager_test.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
-#include "chrome/browser/chromeos/login/users/user.h"
 #include "chrome/browser/chromeos/login/users/user_manager.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "chrome/browser/chromeos/policy/cloud_external_data_manager_base_test_util.h"
@@ -40,6 +39,7 @@
 #include "components/policy/core/common/cloud/cloud_policy_store.h"
 #include "components/policy/core/common/cloud/cloud_policy_validator.h"
 #include "components/policy/core/common/cloud/policy_builder.h"
+#include "components/user_manager/user.h"
 #include "content/public/test/browser_test_utils.h"
 #include "crypto/rsa_private_key.h"
 #include "net/test/embedded_test_server/embedded_test_server.h"
@@ -63,7 +63,7 @@ const char kBlueImageFileName[] = "chromeos/wallpapers/blue.jpg";
 const SkColor kRedImageColor = SkColorSetARGB(255, 199, 6, 7);
 const SkColor kGreenImageColor = SkColorSetARGB(255, 38, 196, 15);
 
-policy::CloudPolicyStore* GetStoreForUser(const User* user) {
+policy::CloudPolicyStore* GetStoreForUser(const user_manager::User* user) {
   Profile* profile = ProfileHelper::Get()->GetProfileByUser(user);
   if (!profile) {
     ADD_FAILURE();
@@ -245,7 +245,7 @@ class WallpaperManagerPolicyTest
     }
     builder->Build();
     fake_session_manager_client_->set_user_policy(user_id, builder->GetBlob());
-    const User* user = UserManager::Get()->FindUser(user_id);
+    const user_manager::User* user = UserManager::Get()->FindUser(user_id);
     ASSERT_TRUE(user);
     policy::CloudPolicyStore* store = GetStoreForUser(user);
     ASSERT_TRUE(store);
@@ -300,14 +300,14 @@ IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest, SetResetClear) {
   InjectPolicy(0, kRedImageFileName);
   RunUntilWallpaperChangeCount(2);
   GetUserWallpaperInfo(0, &info);
-  ASSERT_EQ(User::POLICY, info.type);
+  ASSERT_EQ(user_manager::User::POLICY, info.type);
   ASSERT_EQ(kRedImageColor, GetAverageBackgroundColor());
 
   // First user: Set wallpaper policy to green image and verify average color.
   InjectPolicy(0, kGreenImageFileName);
   RunUntilWallpaperChangeCount(3);
   GetUserWallpaperInfo(0, &info);
-  ASSERT_EQ(User::POLICY, info.type);
+  ASSERT_EQ(user_manager::User::POLICY, info.type);
   ASSERT_EQ(kGreenImageColor, GetAverageBackgroundColor());
 
   // First user: Clear wallpaper policy and verify that the default wallpaper is
@@ -315,7 +315,7 @@ IN_PROC_BROWSER_TEST_F(WallpaperManagerPolicyTest, SetResetClear) {
   InjectPolicy(0, "");
   RunUntilWallpaperChangeCount(4);
   GetUserWallpaperInfo(0, &info);
-  ASSERT_EQ(User::DEFAULT, info.type);
+  ASSERT_EQ(user_manager::User::DEFAULT, info.type);
   ASSERT_EQ(original_background_color, GetAverageBackgroundColor());
 
   // Check wallpaper change count to ensure that setting the second user's