UserManager stack refactoring.

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 e5a45f3b09eb77ae2664fdeee5c6b323db02bd2c..684a00350680e35350d44139d2ea3f1161f88abd 100644
--- a/components/user_manager/user.h
+++ b/components/user_manager/user.h
@@ -20,7 +20,7 @@
 namespace chromeos {
 class ChromeUserManagerImpl;
 class FakeLoginUtils;
-class FakeUserManager;
+class FakeChromeUserManager;
 class MockUserManager;
 class SupervisedUserManagerImpl;
 class UserAddingScreenTest;
@@ -31,6 +31,7 @@ class UserSessionManager;
 namespace user_manager {
 
 class UserManagerBase;
+class FakeUserManager;
 
 // A class representing information about a previously logged in user.
 // Each user has a canonical email (username), returned by |email()| and
@@ -169,9 +170,10 @@ class USER_MANAGER_EXPORT User : public UserInfo {
   friend class chromeos::UserSessionManager;
 
   // For testing:
+  friend class FakeUserManager;
+  friend class chromeos::FakeChromeUserManager;
   friend class chromeos::MockUserManager;
   friend class chromeos::FakeLoginUtils;
-  friend class chromeos::FakeUserManager;
   friend class chromeos::UserAddingScreenTest;
 
   // Do not allow anyone else to create new User instances.