[cros] user_manager component - move UserManagerBase and UserManager

components/user_manager/user.h

Index: components/user_manager/user.h
diff --git a/components/user_manager/user.h b/components/user_manager/user.h
index 23e8230bf25f5f2f9984a9400bd69a89d363f2de..5ff8a10b124b55f1faafb5a398fa9169ee169134 100644
--- a/components/user_manager/user.h
+++ b/components/user_manager/user.h
@@ -18,19 +18,20 @@
 #include "ui/gfx/image/image_skia.h"
 
 namespace chromeos {
-class ChromeUserManager;
+class ChromeUserManagerImpl;
 class FakeLoginUtils;
 class FakeUserManager;
 class MockUserManager;
 class SupervisedUserManagerImpl;
 class UserAddingScreenTest;
 class UserImageManagerImpl;
-class UserManagerBase;
 class UserSessionManager;
 }
 
 namespace user_manager {
 
+class UserManagerBase;
+
 // A class representing information about a previously logged in user.
 // Each user has a canonical email (username), returned by |email()| and
 // may have a different displayed email (in the raw form as entered by user),
@@ -148,10 +149,10 @@ class USER_MANAGER_EXPORT User : public UserInfo {
   bool is_profile_created() const { return profile_is_created_; }
 
  protected:
-  friend class chromeos::ChromeUserManager;
+  friend class UserManagerBase;
+  friend class chromeos::ChromeUserManagerImpl;
   friend class chromeos::SupervisedUserManagerImpl;
   friend class chromeos::UserImageManagerImpl;
-  friend class chromeos::UserManagerBase;
   friend class chromeos::UserSessionManager;
 
   // For testing: