UserManager stack refactoring.

Before: while UserManager and UserManagerBase were componentized to user_manager namespace, FakeUserManager was staying at chromeos namespace.

After: UserManager Chrome OS-related interface moved to a separate class ChromeUserManagerInterface. Mixing it to UserManagerBase and FakeUserManager we're getting chrome OS versions of them. That allows us to move UserManagerBase and FakeUserManager into component user_manager.

Main changes are located at .*user_manager.* files. Such as chrome_user_manager, chrome_user_manager_interface, fake_chrome_user_manager, user_manager_base etc.
Other files (mostly tests) were changed due to changes in include paths and FakeUserManager class renaming.

BUG=443119

Review URL: https://codereview.chromium.org/824683002

Cr-Commit-Position: refs/heads/master@{#314532}

47 files changed, 443 insertions, 700 deletions

diff --git a/chrome/browser/BUILD.gn b/chrome/browser/BUILD.gn
index 7359d61..5a65805 100644
--- a/chrome/browser/BUILD.gn
+++ b/chrome/browser/BUILD.gn
@@ -1016,10 +1016,10 @@ source_set("test_support") {
       "chromeos/login/ui/mock_login_display_host.h",
       "chromeos/login/users/avatar/mock_user_image_manager.cc",
       "chromeos/login/users/avatar/mock_user_image_manager.h",
+      "chromeos/login/users/fake_chrome_user_manager.cc",
+      "chromeos/login/users/fake_chrome_user_manager.h",
       "chromeos/login/users/fake_supervised_user_manager.cc",
       "chromeos/login/users/fake_supervised_user_manager.h",
-      "chromeos/login/users/fake_user_manager.cc",
-      "chromeos/login/users/fake_user_manager.h",
       "chromeos/login/users/mock_user_manager.cc",
       "chromeos/login/users/mock_user_manager.h",
       "chromeos/net/network_portal_detector_test_utils.cc",
diff --git a/chrome/browser/chromeos/events/event_rewriter_unittest.cc b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
index 7eaa7b0..aed81d1 100644
--- a/chrome/browser/chromeos/events/event_rewriter_unittest.cc
+++ b/chrome/browser/chromeos/events/event_rewriter_unittest.cc
@@ -17,12 +17,12 @@
 #include "base/strings/stringprintf.h"
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/preferences.h"
 #include "chrome/common/pref_names.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
 #include "chromeos/chromeos_switches.h"
+#include "components/user_manager/fake_user_manager.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_tree_host.h"
@@ -222,7 +222,7 @@ namespace chromeos {
 class EventRewriterTest : public ash::test::AshTestBase {
  public:
   EventRewriterTest()
-      : fake_user_manager_(new chromeos::FakeUserManager),
+      : fake_user_manager_(new user_manager::FakeUserManager),
         user_manager_enabler_(fake_user_manager_),
         input_method_manager_mock_(NULL) {}
   ~EventRewriterTest() override {}
@@ -255,7 +255,7 @@ class EventRewriterTest : public ash::test::AshTestBase {
                       : &event;
   }
 
-  chromeos::FakeUserManager* fake_user_manager_;  // Not owned.
+  user_manager::FakeUserManager* fake_user_manager_;  // Not owned.
   chromeos::ScopedUserManagerEnabler user_manager_enabler_;
   chromeos::input_method::MockInputMethodManager* input_method_manager_mock_;
 };
@@ -1821,7 +1821,7 @@ class EventRewriterAshTest : public ash::test::AshTestBase {
  public:
   EventRewriterAshTest()
       : source_(&buffer_),
-        fake_user_manager_(new chromeos::FakeUserManager),
+        fake_user_manager_(new user_manager::FakeUserManager),
         user_manager_enabler_(fake_user_manager_) {}
   ~EventRewriterAshTest() override {}
 
@@ -1880,7 +1880,7 @@ class EventRewriterAshTest : public ash::test::AshTestBase {
   EventBuffer buffer_;
   TestEventSource source_;
 
-  chromeos::FakeUserManager* fake_user_manager_;  // Not owned.
+  user_manager::FakeUserManager* fake_user_manager_;  // Not owned.
   chromeos::ScopedUserManagerEnabler user_manager_enabler_;
   TestingPrefServiceSyncable prefs_;
 
diff --git a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
index 52e2d13d..13eb977 100644
--- a/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
+++ b/chrome/browser/chromeos/extensions/wallpaper_private_api_unittest.cc
@@ -10,7 +10,7 @@
 #include "base/command_line.h"
 #include "base/memory/scoped_ptr.h"
 #include "chrome/browser/chromeos/extensions/wallpaper_private_api.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"
@@ -27,17 +27,14 @@ const char kTestAccount2[] = "user2@test.com";
 class WallpaperPrivateApiUnittest : public ash::test::AshTestBase {
  public:
   WallpaperPrivateApiUnittest()
-      : fake_user_manager_(new FakeUserManager()),
-        scoped_user_manager_(fake_user_manager_) {
-  }
+      : fake_user_manager_(new FakeChromeUserManager()),
+        scoped_user_manager_(fake_user_manager_) {}
 
  protected:
-  FakeUserManager* fake_user_manager() {
-    return fake_user_manager_;
-  }
+  FakeChromeUserManager* fake_user_manager() { return fake_user_manager_; }
 
  private:
-  FakeUserManager* fake_user_manager_;
+  FakeChromeUserManager* fake_user_manager_;
   ScopedUserManagerEnabler scoped_user_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(WallpaperPrivateApiUnittest);
diff --git a/chrome/browser/chromeos/file_system_provider/mount_path_util_unittest.cc b/chrome/browser/chromeos/file_system_provider/mount_path_util_unittest.cc
index ba0a05c..d8efb00 100644
--- a/chrome/browser/chromeos/file_system_provider/mount_path_util_unittest.cc
+++ b/chrome/browser/chromeos/file_system_provider/mount_path_util_unittest.cc
@@ -12,7 +12,7 @@
 #include "chrome/browser/chromeos/file_system_provider/provided_file_system_interface.h"
 #include "chrome/browser/chromeos/file_system_provider/service.h"
 #include "chrome/browser/chromeos/file_system_provider/service_factory.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/profiles/profile.h"
 #include "chrome/test/base/testing_browser_process.h"
@@ -74,7 +74,7 @@ class FileSystemProviderMountPathUtilTest : public testing::Test {
         new TestingProfileManager(TestingBrowserProcess::GetGlobal()));
     ASSERT_TRUE(profile_manager_->SetUp());
     profile_ = profile_manager_->CreateTestingProfile("testing-profile");
-    user_manager_ = new FakeUserManager();
+    user_manager_ = new FakeChromeUserManager();
     user_manager_enabler_.reset(new ScopedUserManagerEnabler(user_manager_));
     user_manager_->AddUser(profile_->GetProfileName());
     ServiceFactory::GetInstance()->SetTestingFactory(profile_, &CreateService);
@@ -93,7 +93,7 @@ class FileSystemProviderMountPathUtilTest : public testing::Test {
   scoped_ptr<TestingProfileManager> profile_manager_;
   TestingProfile* profile_;  // Owned by TestingProfileManager.
   scoped_ptr<ScopedUserManagerEnabler> user_manager_enabler_;
-  FakeUserManager* user_manager_;
+  FakeChromeUserManager* user_manager_;
   Service* file_system_provider_service_;  // Owned by its factory.
 };
 
diff --git a/chrome/browser/chromeos/file_system_provider/service_unittest.cc b/chrome/browser/chromeos/file_system_provider/service_unittest.cc
index d8d23fb..29d4e98 100644
--- a/chrome/browser/chromeos/file_system_provider/service_unittest.cc
+++ b/chrome/browser/chromeos/file_system_provider/service_unittest.cc
@@ -16,7 +16,7 @@
 #include "chrome/browser/chromeos/file_system_provider/observer.h"
 #include "chrome/browser/chromeos/file_system_provider/provided_file_system_info.h"
 #include "chrome/browser/chromeos/file_system_provider/registry_interface.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_pref_service_syncable.h"
@@ -179,7 +179,7 @@ class FileSystemProviderServiceTest : public testing::Test {
         new TestingProfileManager(TestingBrowserProcess::GetGlobal()));
     ASSERT_TRUE(profile_manager_->SetUp());
     profile_ = profile_manager_->CreateTestingProfile("test-user@example.com");
-    user_manager_ = new FakeUserManager();
+    user_manager_ = new FakeChromeUserManager();
     user_manager_->AddUser(profile_->GetProfileName());
     user_manager_enabler_.reset(new ScopedUserManagerEnabler(user_manager_));
     extension_registry_.reset(new extensions::ExtensionRegistry(profile_));
@@ -201,7 +201,7 @@ class FileSystemProviderServiceTest : public testing::Test {
   content::TestBrowserThreadBundle thread_bundle_;
   scoped_ptr<TestingProfileManager> profile_manager_;
   TestingProfile* profile_;
-  FakeUserManager* user_manager_;
+  FakeChromeUserManager* user_manager_;
   scoped_ptr<ScopedUserManagerEnabler> user_manager_enabler_;
   scoped_ptr<extensions::ExtensionRegistry> extension_registry_;
   scoped_ptr<Service> service_;
diff --git a/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc b/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc
index 35f36c3e8..2d071bf 100644
--- a/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc
+++ b/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc
@@ -8,7 +8,7 @@
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
 #include "chrome/browser/chromeos/language_preferences.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/profiles/profile_manager.h"
@@ -35,7 +35,7 @@ class InputMethodPersistenceTest : public testing::Test {
  protected:
   InputMethodPersistenceTest()
       : mock_profile_manager_(TestingBrowserProcess::GetGlobal()),
-        fake_user_manager_(new chromeos::FakeUserManager()),
+        fake_user_manager_(new chromeos::FakeChromeUserManager()),
         user_manager_enabler_(fake_user_manager_) {}
 
   void SetUp() override {
@@ -71,7 +71,7 @@ class InputMethodPersistenceTest : public testing::Test {
   TestingPrefServiceSyncable* mock_user_prefs_;
   MockInputMethodManager mock_manager_;
   TestingProfileManager mock_profile_manager_;
-  chromeos::FakeUserManager* fake_user_manager_;
+  chromeos::FakeChromeUserManager* fake_user_manager_;
   chromeos::ScopedUserManagerEnabler user_manager_enabler_;
 };
 
diff --git a/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc b/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc
index 62d9ccc..c3dcd6e 100644
--- a/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc
+++ b/chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc
@@ -16,7 +16,6 @@
 #include "base/run_loop.h"
 #include "base/strings/string_util.h"
 #include "base/strings/stringprintf.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"
@@ -44,6 +43,7 @@
 #include "chromeos/login/auth/user_context.h"
 #include "chromeos/login/login_state.h"
 #include "components/ownership/mock_owner_key_util.h"
+#include "components/user_manager/fake_user_manager.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "crypto/nss_util_internal.h"
 #include "crypto/scoped_test_nss_chromeos_user.h"
@@ -131,7 +131,7 @@ class CryptohomeAuthenticatorTest : public testing::Test {
  public:
   CryptohomeAuthenticatorTest()
       : user_context_("me@nowhere.org"),
-        user_manager_(new FakeUserManager()),
+        user_manager_(new user_manager::FakeUserManager()),
         user_manager_enabler_(user_manager_),
         mock_caller_(NULL),
         mock_homedir_methods_(NULL),
@@ -325,7 +325,7 @@ class CryptohomeAuthenticatorTest : public testing::Test {
 
   TestingProfile profile_;
   scoped_ptr<TestingProfileManager> profile_manager_;
-  FakeUserManager* user_manager_;
+  user_manager::FakeUserManager* user_manager_;
   ScopedUserManagerEnabler user_manager_enabler_;
 
   cryptohome::MockAsyncMethodCaller* mock_caller_;
diff --git a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc
index 2f75006..286a85e 100644
--- a/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc
+++ b/chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_unittest.cc
@@ -13,7 +13,7 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager.h"
 #include "chrome/browser/chromeos/login/easy_unlock/easy_unlock_tpm_key_manager_factory.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/prefs/browser_prefs.h"
 #include "chrome/common/chrome_constants.h"
@@ -193,10 +193,9 @@ class EasyUnlockTpmKeyManagerTest : public testing::Test {
  public:
   EasyUnlockTpmKeyManagerTest()
       : thread_bundle_(content::TestBrowserThreadBundle::REAL_IO_THREAD),
-        user_manager_(new chromeos::FakeUserManager),
+        user_manager_(new chromeos::FakeChromeUserManager()),
         user_manager_enabler_(user_manager_),
-        profile_manager_(TestingBrowserProcess::GetGlobal()) {
-  }
+        profile_manager_(TestingBrowserProcess::GetGlobal()) {}
   ~EasyUnlockTpmKeyManagerTest() override {}
 
   void SetUp() override {
@@ -286,7 +285,7 @@ class EasyUnlockTpmKeyManagerTest : public testing::Test {
   scoped_ptr<crypto::ScopedTestSystemNSSKeySlot> test_system_slot_;
 
   // Needed to properly set up signin and user profiles for test.
-  chromeos::FakeUserManager* user_manager_;
+  user_manager::FakeUserManager* user_manager_;
   chromeos::ScopedUserManagerEnabler user_manager_enabler_;
   TestingProfileManager profile_manager_;
 
diff --git a/chrome/browser/chromeos/login/kiosk_browsertest.cc b/chrome/browser/chromeos/login/kiosk_browsertest.cc
index 37a3ae7..340dff9 100644
--- a/chrome/browser/chromeos/login/kiosk_browsertest.cc
+++ b/chrome/browser/chromeos/login/kiosk_browsertest.cc
@@ -31,7 +31,7 @@
 #include "chrome/browser/chromeos/login/test/oobe_screen_waiter.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host.h"
 #include "chrome/browser/chromeos/login/ui/login_display_host_impl.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/mock_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/login/wizard_controller.h"
@@ -1952,15 +1952,14 @@ class KioskHiddenWebUITest : public KioskTest,
 
 IN_PROC_BROWSER_TEST_F(KioskHiddenWebUITest, AutolaunchWarning) {
   // Add a device owner.
-  FakeUserManager* user_manager = new FakeUserManager();
+  FakeChromeUserManager* user_manager = new FakeChromeUserManager();
   user_manager->AddUser(kTestOwnerEmail);
   ScopedUserManagerEnabler enabler(user_manager);
 
   // Set kiosk app to autolaunch.
   EnableConsumerKioskMode();
-  chromeos::WizardController::SkipPostLoginScreensForTesting();
-  chromeos::WizardController* wizard_controller =
-      chromeos::WizardController::default_controller();
+  WizardController::SkipPostLoginScreensForTesting();
+  WizardController* wizard_controller = WizardController::default_controller();
   CHECK(wizard_controller);
 
   // Start login screen after configuring auto launch app since the warning
diff --git a/chrome/browser/chromeos/login/test/oobe_base_test.cc b/chrome/browser/chromeos/login/test/oobe_base_test.cc
index 544f74e..ea0d3f0 100644
--- a/chrome/browser/chromeos/login/test/oobe_base_test.cc
+++ b/chrome/browser/chromeos/login/test/oobe_base_test.cc
@@ -9,13 +9,13 @@
 #include "base/path_service.h"
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/login/existing_user_controller.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
 #include "chrome/browser/chromeos/net/network_portal_detector_test_impl.h"
 #include "chrome/browser/lifetime/application_lifetime.h"
 #include "chrome/common/chrome_paths.h"
 #include "chrome/common/chrome_switches.h"
 #include "chromeos/chromeos_switches.h"
 #include "chromeos/dbus/fake_shill_manager_client.h"
+#include "components/user_manager/fake_user_manager.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 #include "content/public/browser/notification_service.h"
diff --git a/chrome/browser/chromeos/login/test/oobe_base_test.h b/chrome/browser/chromeos/login/test/oobe_base_test.h
index 6530ff4..0337845 100644
--- a/chrome/browser/chromeos/login/test/oobe_base_test.h
+++ b/chrome/browser/chromeos/login/test/oobe_base_test.h
@@ -19,11 +19,10 @@
 
 namespace content {
 class WebUI;
-}  // namespace content
+}
 
 namespace chromeos {
 
-class FakeUserManager;
 class NetworkPortalDetectorTestImpl;
 
 // Base class for OOBE and Kiosk tests.
diff --git a/chrome/browser/chromeos/login/users/chrome_user_manager.cc b/chrome/browser/chromeos/login/users/chrome_user_manager.cc
index eccc602..d2c6a7d 100644
--- a/chrome/browser/chromeos/login/users/chrome_user_manager.cc
+++ b/chrome/browser/chromeos/login/users/chrome_user_manager.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
+#include "components/user_manager/user.h"
 #include "components/user_manager/user_manager.h"
 
 namespace chromeos {
@@ -28,9 +29,8 @@ ChromeUserManager::GetUsersAllowedAsSupervisedUserManagers(
     const user_manager::UserList& user_list) {
   user_manager::UserList result;
   for (user_manager::User* user : user_list) {
-    if (user->GetType() == user_manager::USER_TYPE_REGULAR) {
+    if (user->GetType() == user_manager::USER_TYPE_REGULAR)
       result.push_back(user);
-    }
   }
   return result;
 }
diff --git a/chrome/browser/chromeos/login/users/chrome_user_manager.h b/chrome/browser/chromeos/login/users/chrome_user_manager.h
index 5ec3b8f..d97d2d75 100644
--- a/chrome/browser/chromeos/login/users/chrome_user_manager.h
+++ b/chrome/browser/chromeos/login/users/chrome_user_manager.h
@@ -6,22 +6,16 @@
 #define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_CHROME_USER_MANAGER_H_
 
 #include "base/basictypes.h"
-#include "components/user_manager/user.h"
+#include "base/memory/ref_counted.h"
+#include "base/task_runner.h"
+#include "chrome/browser/chromeos/login/users/user_manager_interface.h"
 #include "components/user_manager/user_manager_base.h"
 
-namespace base {
-class TaskRunner;
-}
-
 namespace chromeos {
 
-class MultiProfileUserController;
-class SupervisedUserManager;
-class UserFlow;
-class UserImageManager;
-
 // Chrome specific interface of the UserManager.
-class ChromeUserManager : public user_manager::UserManagerBase {
+class ChromeUserManager : public user_manager::UserManagerBase,
+                          public UserManagerInterface {
  public:
   ChromeUserManager(scoped_refptr<base::TaskRunner> task_runner,
                     scoped_refptr<base::TaskRunner> blocking_task_runner);
@@ -36,29 +30,6 @@ class ChromeUserManager : public user_manager::UserManagerBase {
   static user_manager::UserList GetUsersAllowedAsSupervisedUserManagers(
       const user_manager::UserList& user_list);
 
-  virtual MultiProfileUserController* GetMultiProfileUserController() = 0;
-  virtual UserImageManager* GetUserImageManager(const std::string& user_id) = 0;
-  virtual SupervisedUserManager* GetSupervisedUserManager() = 0;
-
-  // Method that allows to set |flow| for user identified by |user_id|.
-  // Flow should be set before login attempt.
-  // Takes ownership of the |flow|, |flow| will be deleted in case of login
-  // failure.
-  virtual void SetUserFlow(const std::string& user_id, UserFlow* flow) = 0;
-
-  // Return user flow for current user. Returns instance of DefaultUserFlow if
-  // no flow was defined for current user, or user is not logged in.
-  // Returned value should not be cached.
-  virtual UserFlow* GetCurrentUserFlow() const = 0;
-
-  // Return user flow for user identified by |user_id|. Returns instance of
-  // DefaultUserFlow if no flow was defined for user.
-  // Returned value should not be cached.
-  virtual UserFlow* GetUserFlow(const std::string& user_id) const = 0;
-
-  // Resets user flow for user identified by |user_id|.
-  virtual void ResetUserFlow(const std::string& user_id) = 0;
-
   DISALLOW_COPY_AND_ASSIGN(ChromeUserManager);
 };
 
diff --git a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.h b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.h
index 5d4a2a1..3e1ec1b 100644
--- a/chrome/browser/chromeos/login/users/chrome_user_manager_impl.h
+++ b/chrome/browser/chromeos/login/users/chrome_user_manager_impl.h
@@ -63,7 +63,7 @@ class ChromeUserManagerImpl
   // Registers user manager preferences.
   static void RegisterPrefs(PrefRegistrySimple* registry);
 
-  // ChromeUserManager implementation:
+  // UserManagerInterface implementation:
   MultiProfileUserController* GetMultiProfileUserController() override;
   UserImageManager* GetUserImageManager(const std::string& user_id) override;
   SupervisedUserManager* GetSupervisedUserManager() override;
diff --git a/chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc b/chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc
new file mode 100644
index 0000000..48309e4
--- /dev/null
+++ b/chrome/browser/chromeos/login/users/fake_chrome_user_manager.cc
@@ -0,0 +1,153 @@
+// Copyright 2015 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 "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
+
+#include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
+#include "chrome/browser/chromeos/login/users/fake_supervised_user_manager.h"
+#include "chrome/browser/chromeos/profiles/profile_helper.h"
+#include "chrome/browser/chromeos/settings/cros_settings.h"
+#include "chrome/grit/theme_resources.h"
+#include "components/user_manager/user_image/user_image.h"
+#include "components/user_manager/user_type.h"
+#include "ui/base/resource/resource_bundle.h"
+
+namespace chromeos {
+
+class FakeSupervisedUserManager;
+
+FakeChromeUserManager::FakeChromeUserManager()
+    : supervised_user_manager_(new FakeSupervisedUserManager),
+      multi_profile_user_controller_(NULL) {
+}
+
+FakeChromeUserManager::~FakeChromeUserManager() {
+}
+
+const user_manager::User* FakeChromeUserManager::AddUser(
+    const std::string& email) {
+  user_manager::User* user = user_manager::User::CreateRegularUser(email);
+  user->set_username_hash(
+      ProfileHelper::GetUserIdHashByUserIdForTesting(email));
+  user->SetStubImage(user_manager::UserImage(
+                         *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+                             IDR_PROFILE_PICTURE_LOADING)),
+                     user_manager::User::USER_IMAGE_PROFILE, false);
+  users_.push_back(user);
+  return user;
+}
+
+const user_manager::User* FakeChromeUserManager::AddPublicAccountUser(
+    const std::string& email) {
+  user_manager::User* user = user_manager::User::CreatePublicAccountUser(email);
+  user->set_username_hash(
+      ProfileHelper::GetUserIdHashByUserIdForTesting(email));
+  user->SetStubImage(user_manager::UserImage(
+                         *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
+                             IDR_PROFILE_PICTURE_LOADING)),
+                     user_manager::User::USER_IMAGE_PROFILE, false);
+  users_.push_back(user);
+  return user;
+}
+
+void FakeChromeUserManager::AddKioskAppUser(
+    const std::string& kiosk_app_username) {
+  user_manager::User* user =
+      user_manager::User::CreateKioskAppUser(kiosk_app_username);
+  user->set_username_hash(
+      ProfileHelper::GetUserIdHashByUserIdForTesting(kiosk_app_username));
+  users_.push_back(user);
+}
+
+void FakeChromeUserManager::LoginUser(const std::string& email) {
+  UserLoggedIn(email, ProfileHelper::GetUserIdHashByUserIdForTesting(email),
+               false /* browser_restart */);
+}
+
+MultiProfileUserController*
+FakeChromeUserManager::GetMultiProfileUserController() {
+  return multi_profile_user_controller_;
+}
+
+SupervisedUserManager* FakeChromeUserManager::GetSupervisedUserManager() {
+  return supervised_user_manager_.get();
+}
+
+UserImageManager* FakeChromeUserManager::GetUserImageManager(
+    const std::string& /* user_id */) {
+  return nullptr;
+}
+
+void FakeChromeUserManager::SetUserFlow(const std::string& email,
+                                        UserFlow* flow) {
+}
+
+UserFlow* FakeChromeUserManager::GetCurrentUserFlow() const {
+  return nullptr;
+}
+
+UserFlow* FakeChromeUserManager::GetUserFlow(const std::string& email) const {
+  return nullptr;
+}
+
+void FakeChromeUserManager::ResetUserFlow(const std::string& email) {
+}
+
+void FakeChromeUserManager::SwitchActiveUser(const std::string& email) {
+  active_user_id_ = email;
+  ProfileHelper::Get()->ActiveUserHashChanged(
+      ProfileHelper::GetUserIdHashByUserIdForTesting(email));
+  if (!users_.empty() && !active_user_id_.empty()) {
+    for (user_manager::User* user : users_)
+      user->set_is_active(user->email() == active_user_id_);
+  }
+}
+
+const std::string& FakeChromeUserManager::GetOwnerEmail() const {
+  return owner_email_;
+}
+
+void FakeChromeUserManager::SessionStarted() {
+}
+
+void FakeChromeUserManager::RemoveUser(
+    const std::string& email,
+    user_manager::RemoveUserDelegate* delegate) {
+}
+
+user_manager::UserList
+FakeChromeUserManager::GetUsersAllowedForSupervisedUsersCreation() const {
+  CrosSettings* cros_settings = CrosSettings::Get();
+  bool allow_new_user = true;
+  cros_settings->GetBoolean(kAccountsPrefAllowNewUser, &allow_new_user);
+  bool supervised_users_allowed = AreSupervisedUsersAllowed();
+
+  // Restricted either by policy or by owner.
+  if (!allow_new_user || !supervised_users_allowed)
+    return user_manager::UserList();
+
+  return ChromeUserManager::GetUsersAllowedAsSupervisedUserManagers(GetUsers());
+}
+
+user_manager::UserList FakeChromeUserManager::GetUsersAllowedForMultiProfile()
+    const {
+  // Supervised users are not allowed to use multi-profiles.
+  if (GetLoggedInUsers().size() == 1 &&
+      GetPrimaryUser()->GetType() != user_manager::USER_TYPE_REGULAR) {
+    return user_manager::UserList();
+  }
+
+  user_manager::UserList result;
+  const user_manager::UserList& users = GetUsers();
+  for (user_manager::User* user : users) {
+    if (user->GetType() == user_manager::USER_TYPE_REGULAR &&
+        !user->is_logged_in()) {
+      result.push_back(user);
+    }
+  }
+
+  return result;
+}
+
+}  // namespace chromeos
diff --git a/chrome/browser/chromeos/login/users/fake_chrome_user_manager.h b/chrome/browser/chromeos/login/users/fake_chrome_user_manager.h
new file mode 100644
index 0000000..3a51cf4
--- /dev/null
+++ b/chrome/browser/chromeos/login/users/fake_chrome_user_manager.h
@@ -0,0 +1,82 @@
+// Copyright 2015 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.
+
+#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_FAKE_CHROME_USER_MANAGER_H_
+#define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_FAKE_CHROME_USER_MANAGER_H_
+
+#include <map>
+#include <string>
+
+#include "base/memory/scoped_ptr.h"
+#include "chrome/browser/chromeos/login/user_flow.h"
+#include "chrome/browser/chromeos/login/users/user_manager_interface.h"
+#include "components/user_manager/fake_user_manager.h"
+#include "components/user_manager/user.h"
+#include "components/user_manager/user_image/user_image.h"
+#include "components/user_manager/user_manager_base.h"
+
+namespace chromeos {
+
+class FakeSupervisedUserManager;
+
+// Fake chrome user manager with a barebones implementation. Users can be added
+// and set as logged in, and those users can be returned.
+class FakeChromeUserManager : public user_manager::FakeUserManager,
+                              public UserManagerInterface {
+ public:
+  FakeChromeUserManager();
+  ~FakeChromeUserManager() override;
+
+  // Create and add a kiosk app user.
+  void AddKioskAppUser(const std::string& kiosk_app_username);
+
+  // Create and add a public account user.
+  const user_manager::User* AddPublicAccountUser(const std::string& email);
+
+  // Calculates the user name hash and calls UserLoggedIn to login a user.
+  void LoginUser(const std::string& email);
+
+  // UserManager overrides.
+  user_manager::UserList GetUsersAllowedForMultiProfile() const override;
+
+  // user_manager::FakeUserManager override.
+  const user_manager::User* AddUser(const std::string& email) override;
+
+  // UserManagerInterface implementation.
+  MultiProfileUserController* GetMultiProfileUserController() override;
+  UserImageManager* GetUserImageManager(const std::string& user_id) override;
+  SupervisedUserManager* GetSupervisedUserManager() override;
+  void SetUserFlow(const std::string& email, UserFlow* flow) override;
+  UserFlow* GetCurrentUserFlow() const override;
+  UserFlow* GetUserFlow(const std::string& email) const override;
+  void ResetUserFlow(const std::string& email) override;
+  user_manager::UserList GetUsersAllowedForSupervisedUsersCreation()
+      const override;
+  void SwitchActiveUser(const std::string& email) override;
+  const std::string& GetOwnerEmail() const override;
+  void SessionStarted() override;
+  void RemoveUser(const std::string& email,
+                  user_manager::RemoveUserDelegate* delegate) override;
+
+  void set_owner_email(const std::string& owner_email) {
+    owner_email_ = owner_email;
+  }
+
+  void set_multi_profile_user_controller(
+      MultiProfileUserController* controller) {
+    multi_profile_user_controller_ = controller;
+  }
+
+ private:
+  scoped_ptr<FakeSupervisedUserManager> supervised_user_manager_;
+  std::string owner_email_;
+
+  MultiProfileUserController* multi_profile_user_controller_;
+
+  DISALLOW_COPY_AND_ASSIGN(FakeChromeUserManager);
+};
+
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_FAKE_CHROME_USER_MANAGER_H_
diff --git a/chrome/browser/chromeos/login/users/fake_user_manager.cc b/chrome/browser/chromeos/login/users/fake_user_manager.cc
deleted file mode 100644
index fac64ea..0000000
--- a/chrome/browser/chromeos/login/users/fake_user_manager.cc
+++ /dev/null
@@ -1,357 +0,0 @@
-// Copyright 2014 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 "chrome/browser/chromeos/login/users/fake_user_manager.h"
-
-#include "base/task_runner.h"
-#include "chrome/browser/chromeos/login/users/fake_supervised_user_manager.h"
-#include "chrome/browser/chromeos/profiles/profile_helper.h"
-#include "chrome/grit/theme_resources.h"
-#include "components/user_manager/user_image/user_image.h"
-#include "components/user_manager/user_type.h"
-#include "ui/base/resource/resource_bundle.h"
-
-namespace {
-
-class FakeTaskRunner : public base::TaskRunner {
- public:
-  bool PostDelayedTask(const tracked_objects::Location& from_here,
-                       const base::Closure& task,
-                       base::TimeDelta delay) override {
-    task.Run();
-    return true;
-  }
-  bool RunsTasksOnCurrentThread() const override { return true; }
-
- protected:
-  ~FakeTaskRunner() override {}
-};
-
-}  // namespace
-
-namespace chromeos {
-
-FakeUserManager::FakeUserManager()
-    : ChromeUserManager(new FakeTaskRunner(), new FakeTaskRunner()),
-      supervised_user_manager_(new FakeSupervisedUserManager),
-      primary_user_(NULL),
-      multi_profile_user_controller_(NULL) {
-}
-
-FakeUserManager::~FakeUserManager() {
-  // Can't use STLDeleteElements because of the private destructor of User.
-  for (user_manager::UserList::iterator it = user_list_.begin();
-       it != user_list_.end();
-       it = user_list_.erase(it)) {
-    delete *it;
-  }
-}
-
-const user_manager::User* FakeUserManager::AddUser(const std::string& email) {
-  user_manager::User* user = user_manager::User::CreateRegularUser(email);
-  user->set_username_hash(
-      ProfileHelper::GetUserIdHashByUserIdForTesting(email));
-  user->SetStubImage(user_manager::UserImage(
-                         *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-                             IDR_PROFILE_PICTURE_LOADING)),
-                     user_manager::User::USER_IMAGE_PROFILE,
-                     false);
-  user_list_.push_back(user);
-  return user;
-}
-
-const user_manager::User* FakeUserManager::AddPublicAccountUser(
-    const std::string& email) {
-  user_manager::User* user = user_manager::User::CreatePublicAccountUser(email);
-  user->set_username_hash(
-      ProfileHelper::GetUserIdHashByUserIdForTesting(email));
-  user->SetStubImage(user_manager::UserImage(
-                         *ResourceBundle::GetSharedInstance().GetImageSkiaNamed(
-                             IDR_PROFILE_PICTURE_LOADING)),
-                     user_manager::User::USER_IMAGE_PROFILE,
-                     false);
-  user_list_.push_back(user);
-  return user;
-}
-
-void FakeUserManager::AddKioskAppUser(const std::string& kiosk_app_username) {
-  user_manager::User* user =
-      user_manager::User::CreateKioskAppUser(kiosk_app_username);
-  user->set_username_hash(
-      ProfileHelper::GetUserIdHashByUserIdForTesting(kiosk_app_username));
-  user_list_.push_back(user);
-}
-
-void FakeUserManager::RemoveUserFromList(const std::string& email) {
-  user_manager::UserList::iterator it = user_list_.begin();
-  while (it != user_list_.end() && (*it)->email() != email) ++it;
-  if (it != user_list_.end()) {
-    delete *it;
-    user_list_.erase(it);
-  }
-}
-
-void FakeUserManager::LoginUser(const std::string& email) {
-  UserLoggedIn(
-      email, ProfileHelper::GetUserIdHashByUserIdForTesting(email), false);
-}
-
-const user_manager::UserList& FakeUserManager::GetUsers() const {
-  return user_list_;
-}
-
-user_manager::UserList FakeUserManager::GetUsersAllowedForMultiProfile() const {
-  user_manager::UserList result;
-  for (user_manager::UserList::const_iterator it = user_list_.begin();
-       it != user_list_.end();
-       ++it) {
-    if ((*it)->GetType() == user_manager::USER_TYPE_REGULAR &&
-        !(*it)->is_logged_in())
-      result.push_back(*it);
-  }
-  return result;
-}
-
-user_manager::UserList
-FakeUserManager::GetUsersAllowedForSupervisedUsersCreation() const {
-  return ChromeUserManager::GetUsersAllowedAsSupervisedUserManagers(user_list_);
-}
-
-const user_manager::UserList& FakeUserManager::GetLoggedInUsers() const {
-  return logged_in_users_;
-}
-
-void FakeUserManager::UserLoggedIn(const std::string& email,
-                                   const std::string& username_hash,
-                                   bool browser_restart) {
-  for (user_manager::UserList::const_iterator it = user_list_.begin();
-       it != user_list_.end();
-       ++it) {
-    if ((*it)->username_hash() == username_hash) {
-      (*it)->set_is_logged_in(true);
-      (*it)->set_profile_is_created();
-      logged_in_users_.push_back(*it);
-
-      if (!primary_user_)
-        primary_user_ = *it;
-      break;
-    }
-  }
-}
-
-user_manager::User* FakeUserManager::GetActiveUserInternal() const {
-  if (user_list_.size()) {
-    if (!active_user_id_.empty()) {
-      for (user_manager::UserList::const_iterator it = user_list_.begin();
-           it != user_list_.end();
-           ++it) {
-        if ((*it)->email() == active_user_id_)
-          return *it;
-      }
-    }
-    return user_list_[0];
-  }
-  return NULL;
-}
-
-const user_manager::User* FakeUserManager::GetActiveUser() const {
-  return GetActiveUserInternal();
-}
-
-user_manager::User* FakeUserManager::GetActiveUser() {
-  return GetActiveUserInternal();
-}
-
-void FakeUserManager::SwitchActiveUser(const std::string& email) {
-  active_user_id_ = email;
-  ProfileHelper::Get()->ActiveUserHashChanged(
-      ProfileHelper::GetUserIdHashByUserIdForTesting(email));
-  if (user_list_.size() && !active_user_id_.empty()) {
-    for (user_manager::UserList::const_iterator it = user_list_.begin();
-         it != user_list_.end(); ++it) {
-      (*it)->set_is_active((*it)->email() == active_user_id_);
-    }
-  }
-}
-
-void FakeUserManager::SaveUserDisplayName(
-    const std::string& username,
-    const base::string16& display_name) {
-  for (user_manager::UserList::iterator it = user_list_.begin();
-       it != user_list_.end();
-       ++it) {
-    if ((*it)->email() == username) {
-      (*it)->set_display_name(display_name);
-      return;
-    }
-  }
-}
-
-MultiProfileUserController* FakeUserManager::GetMultiProfileUserController() {
-  return multi_profile_user_controller_;
-}
-
-SupervisedUserManager* FakeUserManager::GetSupervisedUserManager() {
-  return supervised_user_manager_.get();
-}
-
-UserImageManager* FakeUserManager::GetUserImageManager(
-    const std::string& /* user_id */) {
-  return NULL;
-}
-
-const user_manager::UserList& FakeUserManager::GetLRULoggedInUsers() const {
-  return user_list_;
-}
-
-user_manager::UserList FakeUserManager::GetUnlockUsers() const {
-  return user_list_;
-}
-
-const std::string& FakeUserManager::GetOwnerEmail() const {
-  return owner_email_;
-}
-
-bool FakeUserManager::IsKnownUser(const std::string& email) const {
-  return true;
-}
-
-const user_manager::User* FakeUserManager::FindUser(
-    const std::string& email) const {
-  const user_manager::UserList& users = GetUsers();
-  for (user_manager::UserList::const_iterator it = users.begin();
-       it != users.end();
-       ++it) {
-    if ((*it)->email() == email)
-      return *it;
-  }
-  return NULL;
-}
-
-user_manager::User* FakeUserManager::FindUserAndModify(
-    const std::string& email) {
-  return NULL;
-}
-
-const user_manager::User* FakeUserManager::GetLoggedInUser() const {
-  return NULL;
-}
-
-user_manager::User* FakeUserManager::GetLoggedInUser() {
-  return NULL;
-}
-
-const user_manager::User* FakeUserManager::GetPrimaryUser() const {
-  return primary_user_;
-}
-
-base::string16 FakeUserManager::GetUserDisplayName(
-    const std::string& username) const {
-  return base::string16();
-}
-
-std::string FakeUserManager::GetUserDisplayEmail(
-    const std::string& username) const {
-  return std::string();
-}
-
-bool FakeUserManager::IsCurrentUserOwner() const {
-  return false;
-}
-
-bool FakeUserManager::IsCurrentUserNew() const {
-  return false;
-}
-
-bool FakeUserManager::IsCurrentUserNonCryptohomeDataEphemeral() const {
-  return false;
-}
-
-bool FakeUserManager::CanCurrentUserLock() const {
-  return false;
-}
-
-bool FakeUserManager::IsUserLoggedIn() const {
-  return logged_in_users_.size() > 0;
-}
-
-bool FakeUserManager::IsLoggedInAsUserWithGaiaAccount() const {
-  return true;
-}
-
-bool FakeUserManager::IsLoggedInAsPublicAccount() const {
-  return false;
-}
-
-bool FakeUserManager::IsLoggedInAsGuest() const {
-  return false;
-}
-
-bool FakeUserManager::IsLoggedInAsSupervisedUser() const {
-  return false;
-}
-
-bool FakeUserManager::IsLoggedInAsKioskApp() const {
-  const user_manager::User* active_user = GetActiveUser();
-  return active_user
-             ? active_user->GetType() == user_manager::USER_TYPE_KIOSK_APP
-             : false;
-}
-
-bool FakeUserManager::IsLoggedInAsStub() const {
-  return false;
-}
-
-bool FakeUserManager::IsSessionStarted() const {
-  return false;
-}
-
-bool FakeUserManager::IsUserNonCryptohomeDataEphemeral(
-    const std::string& email) const {
-  return false;
-}
-
-UserFlow* FakeUserManager::GetCurrentUserFlow() const {
-  return NULL;
-}
-
-UserFlow* FakeUserManager::GetUserFlow(const std::string& email) const {
-  return NULL;
-}
-
-bool FakeUserManager::AreSupervisedUsersAllowed() const {
-  return true;
-}
-
-bool FakeUserManager::AreEphemeralUsersEnabled() const {
-  return false;
-}
-
-const std::string& FakeUserManager::GetApplicationLocale() const {
-  static const std::string default_locale("en-US");
-  return default_locale;
-}
-
-PrefService* FakeUserManager::GetLocalState() const {
-  return NULL;
-}
-
-bool FakeUserManager::IsEnterpriseManaged() const {
-  return false;
-}
-
-bool FakeUserManager::IsDemoApp(const std::string& user_id) const {
-  return false;
-}
-
-bool FakeUserManager::IsKioskApp(const std::string& user_id) const {
-  return false;
-}
-
-bool FakeUserManager::IsPublicAccountMarkedForRemoval(
-    const std::string& user_id) const {
-  return false;
-}
-
-}  // namespace chromeos
diff --git a/chrome/browser/chromeos/login/users/fake_user_manager.h b/chrome/browser/chromeos/login/users/fake_user_manager.h
deleted file mode 100644
index c8397d4..0000000
--- a/chrome/browser/chromeos/login/users/fake_user_manager.h
+++ /dev/null
@@ -1,165 +0,0 @@
-// Copyright 2014 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.
-
-#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_FAKE_USER_MANAGER_H_
-#define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_FAKE_USER_MANAGER_H_
-
-#include <map>
-#include <string>
-
-#include "base/memory/scoped_ptr.h"
-#include "chrome/browser/chromeos/login/user_flow.h"
-#include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
-#include "components/user_manager/user.h"
-#include "components/user_manager/user_image/user_image.h"
-
-namespace chromeos {
-
-class FakeSupervisedUserManager;
-
-// Fake user manager with a barebones implementation. Users can be added
-// and set as logged in, and those users can be returned.
-class FakeUserManager : public ChromeUserManager {
- public:
-  FakeUserManager();
-  ~FakeUserManager() override;
-
-  // Create and add a new user.
-  const user_manager::User* AddUser(const std::string& email);
-
-  // Create and add a kiosk app user.
-  void AddKioskAppUser(const std::string& kiosk_app_username);
-
-  // Create and add a public account user.
-  const user_manager::User* AddPublicAccountUser(const std::string& email);
-
-  // Calculates the user name hash and calls UserLoggedIn to login a user.
-  void LoginUser(const std::string& email);
-
-  // ChromeUserManager overrides.
-  MultiProfileUserController* GetMultiProfileUserController() override;
-  UserImageManager* GetUserImageManager(const std::string& user_id) override;
-  SupervisedUserManager* GetSupervisedUserManager() override;
-  void SetUserFlow(const std::string& email, UserFlow* flow) override {}
-  UserFlow* GetCurrentUserFlow() const override;
-  UserFlow* GetUserFlow(const std::string& email) const override;
-  void ResetUserFlow(const std::string& email) override {}
-
-  // UserManager overrides.
-  const user_manager::UserList& GetUsers() const override;
-  user_manager::UserList GetUsersAllowedForMultiProfile() const override;
-  user_manager::UserList GetUsersAllowedForSupervisedUsersCreation()
-      const override;
-  const user_manager::UserList& GetLoggedInUsers() const override;
-
-  // Set the user as logged in.
-  void UserLoggedIn(const std::string& email,
-                    const std::string& username_hash,
-                    bool browser_restart) override;
-
-  const user_manager::User* GetActiveUser() const override;
-  user_manager::User* GetActiveUser() override;
-  void SwitchActiveUser(const std::string& email) override;
-  void SaveUserDisplayName(const std::string& username,
-                           const base::string16& display_name) override;
-
-  // Not implemented.
-  void UpdateUserAccountData(const std::string& user_id,
-                             const UserAccountData& account_data) override {}
-  void Shutdown() override {}
-  const user_manager::UserList& GetLRULoggedInUsers() const override;
-  user_manager::UserList GetUnlockUsers() const override;
-  const std::string& GetOwnerEmail() const override;
-  void SessionStarted() override {}
-  void RemoveUser(const std::string& email,
-                  user_manager::RemoveUserDelegate* delegate) override {}
-  void RemoveUserFromList(const std::string& email) override;
-  bool IsKnownUser(const std::string& email) const override;
-  const user_manager::User* FindUser(const std::string& email) const override;
-  user_manager::User* FindUserAndModify(const std::string& email) override;
-  const user_manager::User* GetLoggedInUser() const override;
-  user_manager::User* GetLoggedInUser() override;
-  const user_manager::User* GetPrimaryUser() const override;
-  void SaveUserOAuthStatus(
-      const std::string& username,
-      user_manager::User::OAuthTokenStatus oauth_token_status) override {}
-  void SaveForceOnlineSignin(const std::string& user_id,
-                             bool force_online_signin) override {}
-  base::string16 GetUserDisplayName(const std::string& username) const override;
-  void SaveUserDisplayEmail(const std::string& username,
-                            const std::string& display_email) override {}
-  std::string GetUserDisplayEmail(const std::string& username) const override;
-  bool IsCurrentUserOwner() const override;
-  bool IsCurrentUserNew() const override;
-  bool IsCurrentUserNonCryptohomeDataEphemeral() const override;
-  bool CanCurrentUserLock() const override;
-  bool IsUserLoggedIn() const override;
-  bool IsLoggedInAsUserWithGaiaAccount() const override;
-  bool IsLoggedInAsPublicAccount() const override;
-  bool IsLoggedInAsGuest() const override;
-  bool IsLoggedInAsSupervisedUser() const override;
-  bool IsLoggedInAsKioskApp() const override;
-  bool IsLoggedInAsStub() const override;
-  bool IsSessionStarted() const override;
-  bool IsUserNonCryptohomeDataEphemeral(
-      const std::string& email) const override;
-  void AddObserver(Observer* obs) override {}
-  void RemoveObserver(Observer* obs) override {}
-  void AddSessionStateObserver(UserSessionStateObserver* obs) override {}
-  void RemoveSessionStateObserver(UserSessionStateObserver* obs) override {}
-  void NotifyLocalStateChanged() override {}
-  bool AreSupervisedUsersAllowed() const override;
-
-  // UserManagerBase overrides:
-  bool AreEphemeralUsersEnabled() const override;
-  const std::string& GetApplicationLocale() const override;
-  PrefService* GetLocalState() const override;
-  void HandleUserOAuthTokenStatusChange(
-      const std::string& user_id,
-      user_manager::User::OAuthTokenStatus status) const override {}
-  bool IsEnterpriseManaged() const override;
-  void LoadPublicAccounts(std::set<std::string>* public_sessions_set) override {
-  }
-  void PerformPreUserListLoadingActions() override {}
-  void PerformPostUserListLoadingActions() override {}
-  void PerformPostUserLoggedInActions(bool browser_restart) override {}
-  bool IsDemoApp(const std::string& user_id) const override;
-  bool IsKioskApp(const std::string& user_id) const override;
-  bool IsPublicAccountMarkedForRemoval(
-      const std::string& user_id) const override;
-  void DemoAccountLoggedIn() override {}
-  void KioskAppLoggedIn(const std::string& app_id) override {}
-  void PublicAccountUserLoggedIn(user_manager::User* user) override {}
-  void SupervisedUserLoggedIn(const std::string& user_id) override {}
-
-  void set_owner_email(const std::string& owner_email) {
-    owner_email_ = owner_email;
-  }
-
-  void set_multi_profile_user_controller(
-      MultiProfileUserController* controller) {
-    multi_profile_user_controller_ = controller;
-  }
-
- private:
-  // We use this internal function for const-correctness.
-  user_manager::User* GetActiveUserInternal() const;
-
-  scoped_ptr<FakeSupervisedUserManager> supervised_user_manager_;
-  user_manager::UserList user_list_;
-  user_manager::UserList logged_in_users_;
-  std::string owner_email_;
-  user_manager::User* primary_user_;
-
-  // If set this is the active user. If empty, the first created user is the
-  // active user.
-  std::string active_user_id_;
-  MultiProfileUserController* multi_profile_user_controller_;
-
-  DISALLOW_COPY_AND_ASSIGN(FakeUserManager);
-};
-
-}  // namespace chromeos
-
-#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_FAKE_USER_MANAGER_H_
diff --git a/chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc b/chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc
index bd822ac..126d6f1 100644
--- a/chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc
+++ b/chrome/browser/chromeos/login/users/multi_profile_user_controller_unittest.cc
@@ -7,7 +7,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/run_loop.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller_delegate.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/policy/policy_cert_service.h"
@@ -114,7 +114,7 @@ class MultiProfileUserControllerTest
       public MultiProfileUserControllerDelegate {
  public:
   MultiProfileUserControllerTest()
-      : fake_user_manager_(new FakeUserManager),
+      : fake_user_manager_(new FakeChromeUserManager),
         user_manager_enabler_(fake_user_manager_),
         user_not_allowed_count_(0) {}
   ~MultiProfileUserControllerTest() override {}
@@ -203,7 +203,7 @@ class MultiProfileUserControllerTest
   content::TestBrowserThreadBundle threads_;
   scoped_ptr<policy::PolicyCertVerifier> cert_verifier_;
   scoped_ptr<TestingProfileManager> profile_manager_;
-  FakeUserManager* fake_user_manager_;  // Not owned
+  FakeChromeUserManager* fake_user_manager_;  // Not owned
   ScopedUserManagerEnabler user_manager_enabler_;
 
   scoped_ptr<MultiProfileUserController> controller_;
diff --git a/chrome/browser/chromeos/login/users/user_manager_interface.h b/chrome/browser/chromeos/login/users/user_manager_interface.h
new file mode 100644
index 0000000..b17c543
--- /dev/null
+++ b/chrome/browser/chromeos/login/users/user_manager_interface.h
@@ -0,0 +1,59 @@
+// Copyright 2015 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.
+
+#ifndef CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_MANAGER_INTERFACE_H_
+#define CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_MANAGER_INTERFACE_H_
+
+#include "base/basictypes.h"
+#include "components/user_manager/user.h"
+#include "components/user_manager/user_type.h"
+
+namespace chromeos {
+
+class MultiProfileUserController;
+class SupervisedUserManager;
+class UserFlow;
+class UserImageManager;
+
+// Chrome specific add-ons interface for the UserManager.
+class UserManagerInterface {
+ public:
+  UserManagerInterface() {}
+  virtual ~UserManagerInterface() {}
+
+  virtual MultiProfileUserController* GetMultiProfileUserController() = 0;
+  virtual UserImageManager* GetUserImageManager(const std::string& user_id) = 0;
+  virtual SupervisedUserManager* GetSupervisedUserManager() = 0;
+
+  // Method that allows to set |flow| for user identified by |user_id|.
+  // Flow should be set before login attempt.
+  // Takes ownership of the |flow|, |flow| will be deleted in case of login
+  // failure.
+  virtual void SetUserFlow(const std::string& user_id, UserFlow* flow) = 0;
+
+  // Return user flow for current user. Returns instance of DefaultUserFlow if
+  // no flow was defined for current user, or user is not logged in.
+  // Returned value should not be cached.
+  virtual UserFlow* GetCurrentUserFlow() const = 0;
+
+  // Return user flow for user identified by |user_id|. Returns instance of
+  // DefaultUserFlow if no flow was defined for user.
+  // Returned value should not be cached.
+  virtual UserFlow* GetUserFlow(const std::string& user_id) const = 0;
+
+  // Resets user flow for user identified by |user_id|.
+  virtual void ResetUserFlow(const std::string& user_id) = 0;
+
+  // Returns list of users allowed for supervised user creation.
+  // Returns an empty list in cases when supervised user creation or adding new
+  // users is restricted.
+  virtual user_manager::UserList GetUsersAllowedForSupervisedUsersCreation()
+      const = 0;
+
+  DISALLOW_COPY_AND_ASSIGN(UserManagerInterface);
+};
+
+}  // namespace chromeos
+
+#endif  // CHROME_BROWSER_CHROMEOS_LOGIN_USERS_USER_MANAGER_INTERFACE_H_
diff --git a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc
index b8f2b56..12ab229 100644
--- a/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc
+++ b/chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager_unittest.cc
@@ -19,7 +19,7 @@
 #include "base/prefs/pref_service.h"
 #include "base/prefs/testing_pref_service.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/login/users/wallpaper/wallpaper_manager.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
@@ -39,14 +39,13 @@ namespace chromeos {
 class WallpaperManagerCacheTest : public test::AshTestBase {
  public:
   WallpaperManagerCacheTest()
-      : fake_user_manager_(new FakeUserManager()),
-        scoped_user_manager_(fake_user_manager_) {
-  }
+      : fake_user_manager_(new FakeChromeUserManager()),
+        scoped_user_manager_(fake_user_manager_) {}
 
  protected:
   ~WallpaperManagerCacheTest() override {}
 
-  FakeUserManager* fake_user_manager() { return fake_user_manager_; }
+  FakeChromeUserManager* fake_user_manager() { return fake_user_manager_; }
 
   void SetUp() override { test::AshTestBase::SetUp(); }
 
@@ -59,7 +58,7 @@ class WallpaperManagerCacheTest : public test::AshTestBase {
   }
 
  private:
-  FakeUserManager* fake_user_manager_;
+  FakeChromeUserManager* fake_user_manager_;
   ScopedUserManagerEnabler scoped_user_manager_;
 };
 
diff --git a/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_unittest.cc b/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_unittest.cc
index c079806..ecca0d5 100644
--- a/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_unittest.cc
+++ b/chrome/browser/chromeos/policy/affiliated_invalidation_service_provider_unittest.cc
@@ -7,7 +7,7 @@
 #include <string>
 
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/policy/stub_enterprise_install_attributes.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
@@ -112,7 +112,7 @@ class AffiliatedInvalidationServiceProviderTest : public testing::Test {
 
  private:
   content::TestBrowserThreadBundle thread_bundle_;
-  chromeos::FakeUserManager* fake_user_manager_;
+  chromeos::FakeChromeUserManager* fake_user_manager_;
   chromeos::ScopedUserManagerEnabler user_manager_enabler_;
   ScopedStubEnterpriseInstallAttributes install_attributes_;
   scoped_ptr<chromeos::ScopedTestDeviceSettingsService>
@@ -131,7 +131,7 @@ AffiliatedInvalidationServiceProviderTest::
 AffiliatedInvalidationServiceProviderTest()
     : device_invalidation_service_(nullptr),
       profile_invalidation_service_(nullptr),
-      fake_user_manager_(new chromeos::FakeUserManager),
+      fake_user_manager_(new chromeos::FakeChromeUserManager),
       user_manager_enabler_(fake_user_manager_),
       install_attributes_("example.com",
                           "user@example.com",
diff --git a/chrome/browser/chromeos/policy/consumer_enrollment_handler_factory_unittest.cc b/chrome/browser/chromeos/policy/consumer_enrollment_handler_factory_unittest.cc
index 5f8b595..8e56c19 100644
--- a/chrome/browser/chromeos/policy/consumer_enrollment_handler_factory_unittest.cc
+++ b/chrome/browser/chromeos/policy/consumer_enrollment_handler_factory_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/consumer_management_service.h"
@@ -27,10 +27,10 @@ class ConsumerEnrollmentHandlerFactoryTest : public testing::Test {
  public:
   ConsumerEnrollmentHandlerFactoryTest()
       : fake_service_(new FakeConsumerManagementService()),
-        fake_user_manager_(new chromeos::FakeUserManager()),
+        fake_user_manager_(new chromeos::FakeChromeUserManager()),
         scoped_user_manager_enabler_(fake_user_manager_),
-        testing_profile_manager_(new TestingProfileManager(
-            TestingBrowserProcess::GetGlobal())) {
+        testing_profile_manager_(
+            new TestingProfileManager(TestingBrowserProcess::GetGlobal())) {
     // Set up FakeConsumerManagementService.
     fake_service_->SetStatusAndStage(
         ConsumerManagementService::STATUS_ENROLLING,
@@ -42,7 +42,7 @@ class ConsumerEnrollmentHandlerFactoryTest : public testing::Test {
     connector->SetConsumerManagementServiceForTesting(
         make_scoped_ptr(fake_service_));
 
-    // Set up FakeUserManager.
+    // Set up FakeChromeUserManager.
     fake_user_manager_->AddUser(kTestOwner);
     fake_user_manager_->AddUser(kTestUser);
     fake_user_manager_->set_owner_email(kTestOwner);
@@ -53,7 +53,7 @@ class ConsumerEnrollmentHandlerFactoryTest : public testing::Test {
   }
 
   FakeConsumerManagementService* fake_service_;
-  chromeos::FakeUserManager* fake_user_manager_;
+  chromeos::FakeChromeUserManager* fake_user_manager_;
   chromeos::ScopedUserManagerEnabler scoped_user_manager_enabler_;
   scoped_ptr<TestingProfileManager> testing_profile_manager_;
 };
diff --git a/chrome/browser/chromeos/policy/consumer_enrollment_handler_unittest.cc b/chrome/browser/chromeos/policy/consumer_enrollment_handler_unittest.cc
index 4c518c0..15ecd7e 100644
--- a/chrome/browser/chromeos/policy/consumer_enrollment_handler_unittest.cc
+++ b/chrome/browser/chromeos/policy/consumer_enrollment_handler_unittest.cc
@@ -8,7 +8,7 @@
 #include "base/run_loop.h"
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/consumer_management_service.h"
@@ -40,10 +40,10 @@ class ConsumerEnrollmentHandlerTest : public testing::Test {
   ConsumerEnrollmentHandlerTest()
       : fake_service_(new FakeConsumerManagementService()),
         fake_initializer_(new FakeDeviceCloudPolicyInitializer()),
-        fake_user_manager_(new chromeos::FakeUserManager()),
+        fake_user_manager_(new chromeos::FakeChromeUserManager()),
         scoped_user_manager_enabler_(fake_user_manager_),
-        testing_profile_manager_(new TestingProfileManager(
-            TestingBrowserProcess::GetGlobal())) {
+        testing_profile_manager_(
+            new TestingProfileManager(TestingBrowserProcess::GetGlobal())) {
     // Set up FakeConsumerManagementService.
     fake_service_->SetStatusAndStage(
         ConsumerManagementService::STATUS_ENROLLING,
@@ -57,7 +57,7 @@ class ConsumerEnrollmentHandlerTest : public testing::Test {
     connector->SetDeviceCloudPolicyInitializerForTesting(
         make_scoped_ptr(fake_initializer_));
 
-    // Set up FakeUserManager.
+    // Set up FakeChromeUserManager.
     fake_user_manager_->AddUser(kTestOwner);
     fake_user_manager_->AddUser(kTestUser);
     fake_user_manager_->set_owner_email(kTestOwner);
@@ -92,7 +92,7 @@ class ConsumerEnrollmentHandlerTest : public testing::Test {
   content::TestBrowserThreadBundle thread_bundle;
   FakeConsumerManagementService* fake_service_;
   FakeDeviceCloudPolicyInitializer* fake_initializer_;
-  chromeos::FakeUserManager* fake_user_manager_;
+  chromeos::FakeChromeUserManager* fake_user_manager_;
   chromeos::ScopedUserManagerEnabler scoped_user_manager_enabler_;
   scoped_ptr<TestingProfileManager> testing_profile_manager_;
   Profile* profile_;
diff --git a/chrome/browser/chromeos/policy/consumer_management_notifier_factory_unittest.cc b/chrome/browser/chromeos/policy/consumer_management_notifier_factory_unittest.cc
index d29be20..ca78a43 100644
--- a/chrome/browser/chromeos/policy/consumer_management_notifier_factory_unittest.cc
+++ b/chrome/browser/chromeos/policy/consumer_management_notifier_factory_unittest.cc
@@ -6,7 +6,7 @@
 
 #include "chrome/browser/browser_process.h"
 #include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/consumer_management_service.h"
@@ -27,10 +27,10 @@ class ConsumerManagementNotifierFactoryTest : public testing::Test {
  public:
   ConsumerManagementNotifierFactoryTest()
       : fake_service_(new FakeConsumerManagementService()),
-        fake_user_manager_(new chromeos::FakeUserManager()),
+        fake_user_manager_(new chromeos::FakeChromeUserManager()),
         scoped_user_manager_enabler_(fake_user_manager_),
-        testing_profile_manager_(new TestingProfileManager(
-            TestingBrowserProcess::GetGlobal())) {
+        testing_profile_manager_(
+            new TestingProfileManager(TestingBrowserProcess::GetGlobal())) {
     // Set up FakeConsumerManagementService.
     fake_service_->SetStatusAndStage(
         ConsumerManagementService::STATUS_UNENROLLED,
@@ -42,7 +42,7 @@ class ConsumerManagementNotifierFactoryTest : public testing::Test {
     connector->SetConsumerManagementServiceForTesting(
         make_scoped_ptr(fake_service_));
 
-    // Set up FakeUserManager.
+    // Set up FakeChromeUserManager.
     fake_user_manager_->AddUser(kTestOwner);
     fake_user_manager_->AddUser(kTestUser);
     fake_user_manager_->set_owner_email(kTestOwner);
@@ -53,7 +53,7 @@ class ConsumerManagementNotifierFactoryTest : public testing::Test {
   }
 
   FakeConsumerManagementService* fake_service_;
-  chromeos::FakeUserManager* fake_user_manager_;
+  chromeos::FakeChromeUserManager* fake_user_manager_;
   chromeos::ScopedUserManagerEnabler scoped_user_manager_enabler_;
   scoped_ptr<TestingProfileManager> testing_profile_manager_;
 };
diff --git a/chrome/browser/chromeos/power/extension_event_observer_unittest.cc b/chrome/browser/chromeos/power/extension_event_observer_unittest.cc
index acc30b7..d35a740 100644
--- a/chrome/browser/chromeos/power/extension_event_observer_unittest.cc
+++ b/chrome/browser/chromeos/power/extension_event_observer_unittest.cc
@@ -10,7 +10,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/settings/cros_settings.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
@@ -36,7 +36,7 @@ class ExtensionEventObserverTest : public ::testing::Test {
  public:
   ExtensionEventObserverTest()
       : power_manager_client_(new FakePowerManagerClient()),
-        fake_user_manager_(new FakeUserManager()),
+        fake_user_manager_(new FakeChromeUserManager()),
         scoped_user_manager_enabler_(fake_user_manager_) {
     DBusThreadManager::GetSetterForTesting()->SetPowerManagerClient(
         make_scoped_ptr(power_manager_client_));
@@ -132,7 +132,7 @@ class ExtensionEventObserverTest : public ::testing::Test {
   ScopedTestCrosSettings test_cros_settings_;
 
   // Owned by |scoped_user_manager_enabler_|.
-  FakeUserManager* fake_user_manager_;
+  FakeChromeUserManager* fake_user_manager_;
   ScopedUserManagerEnabler scoped_user_manager_enabler_;
 
   std::vector<scoped_refptr<extensions::Extension>> created_apps_;
diff --git a/chrome/browser/chromeos/power/power_prefs_unittest.cc b/chrome/browser/chromeos/power/power_prefs_unittest.cc
index cd881fa..9bf1e9c 100644
--- a/chrome/browser/chromeos/power/power_prefs_unittest.cc
+++ b/chrome/browser/chromeos/power/power_prefs_unittest.cc
@@ -11,7 +11,7 @@
 #include "base/memory/ref_counted.h"
 #include "base/prefs/pref_service.h"
 #include "chrome/browser/chrome_notification_types.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/extensions/extension_special_storage_policy.h"
@@ -234,7 +234,7 @@ TEST_F(PowerPrefsTest, LoginScreen) {
 }
 
 TEST_F(PowerPrefsTest, UserSession) {
-  FakeUserManager* user_manager = new FakeUserManager();
+  FakeChromeUserManager* user_manager = new FakeChromeUserManager();
   ScopedUserManagerEnabler user_manager_enabler(user_manager);
 
   // Set up user profile.
diff --git a/chrome/browser/chromeos/preferences_unittest.cc b/chrome/browser/chromeos/preferences_unittest.cc
index b4f6c95..b58fb5d 100644
--- a/chrome/browser/chromeos/preferences_unittest.cc
+++ b/chrome/browser/chromeos/preferences_unittest.cc
@@ -11,7 +11,7 @@
 #include "chrome/browser/chromeos/input_method/input_method_configuration.h"
 #include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"
 #include "chrome/browser/chromeos/login/session/user_session_manager.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/system/fake_input_device_settings.h"
 #include "chrome/common/chrome_constants.h"
@@ -149,7 +149,8 @@ class PreferencesTest : public testing::Test {
         new TestingProfileManager(TestingBrowserProcess::GetGlobal()));
     ASSERT_TRUE(profile_manager_->SetUp());
 
-    chromeos::FakeUserManager* user_manager = new chromeos::FakeUserManager();
+    chromeos::FakeChromeUserManager* user_manager =
+        new chromeos::FakeChromeUserManager();
     user_manager_enabler_.reset(
         new chromeos::ScopedUserManagerEnabler(user_manager));
 
diff --git a/chrome/browser/chromeos/profiles/profile_helper.h b/chrome/browser/chromeos/profiles/profile_helper.h
index 654a98b..cac7855 100644
--- a/chrome/browser/chromeos/profiles/profile_helper.h
+++ b/chrome/browser/chromeos/profiles/profile_helper.h
@@ -126,7 +126,7 @@ class ProfileHelper
   friend class CryptohomeAuthenticatorTest;
   friend class DeviceSettingsTestBase;
   friend class extensions::ExtensionGarbageCollectorChromeOSUnitTest;
-  friend class FakeUserManager;
+  friend class FakeChromeUserManager;
   friend class KioskTest;
   friend class MockUserManager;
   friend class MultiProfileUserControllerTest;
diff --git a/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc b/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc
index c5fefff..09f7c18 100644
--- a/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc
+++ b/chrome/browser/chromeos/profiles/profile_list_chromeos_unittest.cc
@@ -9,7 +9,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/strings/string16.h"
 #include "base/strings/utf_string_conversions.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/prefs/pref_service_syncable.h"
@@ -58,22 +58,24 @@ class ProfileListChromeOSTest : public testing::Test {
     // AvatarMenu and multiple profiles works after user logged in.
     manager_.SetLoggedIn(true);
 
-    // Initialize the UserManager singleton to a fresh FakeUserManager instance.
+    // Initialize the UserManager singleton to a fresh FakeChromeUserManager
+    // instance.
     user_manager_enabler_.reset(
-        new ScopedUserManagerEnabler(new FakeUserManager));
+        new ScopedUserManagerEnabler(new FakeChromeUserManager));
   }
 
-  FakeUserManager* GetFakeUserManager() {
-    return static_cast<FakeUserManager*>(user_manager::UserManager::Get());
+  FakeChromeUserManager* GetFakeChromeUserManager() {
+    return static_cast<FakeChromeUserManager*>(
+        user_manager::UserManager::Get());
   }
 
   void AddProfile(base::string16 name, bool log_in) {
     std::string email_string = base::UTF16ToASCII(name) + "@example.com";
 
     // Add a user to the fake user manager.
-    GetFakeUserManager()->AddUser(email_string);
+    GetFakeChromeUserManager()->AddUser(email_string);
     if (log_in)
-      GetFakeUserManager()->LoginUser(email_string);
+      GetFakeChromeUserManager()->LoginUser(email_string);
 
     // Create a profile for the user.
     manager()->CreateTestingProfile(email_string);
@@ -96,7 +98,7 @@ class ProfileListChromeOSTest : public testing::Test {
 
   void ActiveUserChanged(const base::string16& name) {
     std::string email_string = base::UTF16ToASCII(name) + "@example.com";
-    GetFakeUserManager()->SwitchActiveUser(email_string);
+    GetFakeChromeUserManager()->SwitchActiveUser(email_string);
   }
 
   TestingProfileManager* manager() { return &manager_; }
@@ -163,7 +165,7 @@ TEST_F(ProfileListChromeOSTest, DontShowSupervisedUsers) {
       cache->GetUserDataDir().AppendASCII("p2"), supervised_name,
       base::string16(), 0, "TEST_ID");
 
-  GetFakeUserManager()->AddUser(base::UTF16ToASCII(supervised_name));
+  GetFakeChromeUserManager()->AddUser(base::UTF16ToASCII(supervised_name));
 
   AvatarMenu* menu = GetAvatarMenu();
   ASSERT_EQ(1U, menu->GetNumberOfItems());
@@ -238,7 +240,7 @@ TEST_F(ProfileListChromeOSTest, ModifyingNameResortsCorrectly) {
 
   // Change name of the first profile, to trigger resorting of the profiles:
   // now the first menu item should be named "beta", and the second be "gamma".
-  GetFakeUserManager()->SaveUserDisplayName(
+  GetFakeChromeUserManager()->SaveUserDisplayName(
       base::UTF16ToASCII(name1) + "@example.com", newname1);
   manager()->profile_info_cache()->SetNameOfProfileAtIndex(0, newname1);
 
diff --git a/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc b/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc
index 56366f8..d6e9b6c 100644
--- a/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc
+++ b/chrome/browser/chromeos/settings/device_settings_provider_unittest.cc
@@ -12,7 +12,6 @@
 #include "base/path_service.h"
 #include "base/test/scoped_path_override.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
 #include "chrome/browser/chromeos/policy/device_local_account.h"
 #include "chrome/browser/chromeos/policy/proto/chrome_device_policy.pb.h"
 #include "chrome/browser/chromeos/settings/device_settings_test_helper.h"
@@ -21,6 +20,7 @@
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/settings/cros_settings_names.h"
+#include "components/user_manager/fake_user_manager.h"
 #include "components/user_manager/user.h"
 #include "policy/proto/device_management_backend.pb.h"
 #include "testing/gmock/include/gmock/gmock.h"
diff --git a/chrome/browser/chromeos/settings/device_settings_test_helper.cc b/chrome/browser/chromeos/settings/device_settings_test_helper.cc
index 712b356..ae85dc2 100644
--- a/chrome/browser/chromeos/settings/device_settings_test_helper.cc
+++ b/chrome/browser/chromeos/settings/device_settings_test_helper.cc
@@ -200,7 +200,7 @@ ScopedDeviceSettingsTestHelper::~ScopedDeviceSettingsTestHelper() {
 }
 
 DeviceSettingsTestBase::DeviceSettingsTestBase()
-    : user_manager_(new FakeUserManager()),
+    : user_manager_(new FakeChromeUserManager()),
       user_manager_enabler_(user_manager_),
       owner_key_util_(new ownership::MockOwnerKeyUtil()) {
   OwnerSettingsServiceChromeOSFactory::SetDeviceSettingsServiceForTesting(
diff --git a/chrome/browser/chromeos/settings/device_settings_test_helper.h b/chrome/browser/chromeos/settings/device_settings_test_helper.h
index 05c6be2..0e5742e 100644
--- a/chrome/browser/chromeos/settings/device_settings_test_helper.h
+++ b/chrome/browser/chromeos/settings/device_settings_test_helper.h
@@ -15,7 +15,7 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_util.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/policy/device_policy_builder.h"
 #include "chrome/browser/chromeos/settings/device_settings_service.h"
@@ -180,7 +180,7 @@ class DeviceSettingsTestBase : public testing::Test {
   DeviceSettingsTestHelper device_settings_test_helper_;
   // Note that FakeUserManager is used by ProfileHelper, which some of the
   // tested classes depend on implicitly.
-  FakeUserManager* user_manager_;
+  FakeChromeUserManager* user_manager_;
   ScopedUserManagerEnabler user_manager_enabler_;
   scoped_refptr<ownership::MockOwnerKeyUtil> owner_key_util_;
   // Local DeviceSettingsService instance for tests. Avoid using in combination
diff --git a/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc b/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc
index e3186fb..9eda36b 100644
--- a/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc
+++ b/chrome/browser/chromeos/settings/session_manager_operation_unittest.cc
@@ -14,7 +14,6 @@
 #include "base/memory/scoped_ptr.h"
 #include "base/message_loop/message_loop.h"
 #include "base/time/time.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos.h"
 #include "chrome/browser/chromeos/ownership/owner_settings_service_chromeos_factory.h"
@@ -25,6 +24,7 @@
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
 #include "components/policy/core/common/cloud/cloud_policy_validator.h"
 #include "components/policy/core/common/cloud/policy_builder.h"
+#include "components/user_manager/fake_user_manager.h"
 #include "content/public/test/test_browser_thread.h"
 #include "content/public/test/test_utils.h"
 #include "crypto/rsa_private_key.h"
@@ -45,7 +45,7 @@ class SessionManagerOperationTest : public testing::Test {
       : ui_thread_(content::BrowserThread::UI, &message_loop_),
         file_thread_(content::BrowserThread::FILE, &message_loop_),
         owner_key_util_(new ownership::MockOwnerKeyUtil()),
-        user_manager_(new FakeUserManager()),
+        user_manager_(new user_manager::FakeUserManager()),
         user_manager_enabler_(user_manager_),
         validated_(false) {
     OwnerSettingsServiceChromeOSFactory::GetInstance()
@@ -91,7 +91,7 @@ class SessionManagerOperationTest : public testing::Test {
   DeviceSettingsTestHelper device_settings_test_helper_;
   scoped_refptr<ownership::MockOwnerKeyUtil> owner_key_util_;
 
-  FakeUserManager* user_manager_;
+  user_manager::FakeUserManager* user_manager_;
   ScopedUserManagerEnabler user_manager_enabler_;
 
   scoped_ptr<TestingProfile> profile_;
diff --git a/chrome/browser/chromeos/system/device_disabling_manager_unittest.cc b/chrome/browser/chromeos/system/device_disabling_manager_unittest.cc
index 5453267..771b719 100644
--- a/chrome/browser/chromeos/system/device_disabling_manager_unittest.cc
+++ b/chrome/browser/chromeos/system/device_disabling_manager_unittest.cc
@@ -12,7 +12,6 @@
 #include "base/prefs/testing_pref_service.h"
 #include "base/run_loop.h"
 #include "chrome/browser/browser_process_platform_part.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
 #include "chrome/browser/chromeos/policy/browser_policy_connector_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_cloud_policy_manager_chromeos.h"
 #include "chrome/browser/chromeos/policy/device_policy_builder.h"
@@ -25,6 +24,7 @@
 #include "chromeos/chromeos_switches.h"
 #include "components/ownership/mock_owner_key_util.h"
 #include "components/policy/core/common/cloud/cloud_policy_constants.h"
+#include "components/user_manager/fake_user_manager.h"
 #include "content/public/test/test_browser_thread_bundle.h"
 #include "policy/proto/device_management_backend.pb.h"
 #include "testing/gmock/include/gmock/gmock.h"
@@ -73,7 +73,7 @@ class DeviceDisablingManagerTestBase : public testing::Test,
   policy::ScopedStubEnterpriseInstallAttributes install_attributes_;
   chromeos::ScopedTestDeviceSettingsService test_device_settings_service_;
   chromeos::ScopedTestCrosSettings test_cros_settings_;
-  FakeUserManager fake_user_manager_;
+  user_manager::FakeUserManager fake_user_manager_;
   scoped_ptr<DeviceDisablingManager> device_disabling_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceDisablingManagerTestBase);
diff --git a/chrome/browser/extensions/crx_installer_browsertest.cc b/chrome/browser/extensions/crx_installer_browsertest.cc
index ffbf01e..13d8da7 100644
--- a/chrome/browser/extensions/crx_installer_browsertest.cc
+++ b/chrome/browser/extensions/crx_installer_browsertest.cc
@@ -46,7 +46,7 @@
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h"
 #include "chromeos/chromeos_switches.h"
@@ -533,8 +533,8 @@ IN_PROC_BROWSER_TEST_F(ExtensionCrxInstallerTest, KioskOnlyTest) {
 #if defined(OS_CHROMEOS)
   // Simulate ChromeOS kiosk mode. |scoped_user_manager| will take over
   // lifetime of |user_manager|.
-  chromeos::FakeUserManager* fake_user_manager =
-      new chromeos::FakeUserManager();
+  chromeos::FakeChromeUserManager* fake_user_manager =
+      new chromeos::FakeChromeUserManager();
   fake_user_manager->AddKioskAppUser("example@example.com");
   fake_user_manager->LoginUser("example@example.com");
   chromeos::ScopedUserManagerEnabler scoped_user_manager(fake_user_manager);
diff --git a/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc b/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc
index 6172498..622f324 100644
--- a/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc
+++ b/chrome/browser/extensions/extension_garbage_collector_chromeos_unittest.cc
@@ -13,7 +13,7 @@
 #include "base/strings/string_util.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/values.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
 #include "chrome/browser/extensions/extension_assets_manager_chromeos.h"
@@ -66,9 +66,10 @@ class ExtensionGarbageCollectorChromeOSUnitTest
     ExtensionAssetsManagerChromeOS::SetSharedInstallDirForTesting(cache_dir());
     ExtensionGarbageCollectorChromeOS::ClearGarbageCollectedForTesting();
 
-    // Initialize the UserManager singleton to a fresh FakeUserManager instance.
-    user_manager_enabler_.reset(
-        new chromeos::ScopedUserManagerEnabler(new chromeos::FakeUserManager));
+    // Initialize the UserManager singleton to a fresh FakeChromeUserManager
+    // instance.
+    user_manager_enabler_.reset(new chromeos::ScopedUserManagerEnabler(
+        new chromeos::FakeChromeUserManager));
 
     GetFakeUserManager()->AddUser(chromeos::login::kStubUser);
     GetFakeUserManager()->LoginUser(chromeos::login::kStubUser);
@@ -144,8 +145,8 @@ class ExtensionGarbageCollectorChromeOSUnitTest
     return ExtensionPrefs::Get(profile_.get());
   }
 
-  chromeos::FakeUserManager* GetFakeUserManager() {
-    return static_cast<chromeos::FakeUserManager*>(
+  chromeos::FakeChromeUserManager* GetFakeUserManager() {
+    return static_cast<chromeos::FakeChromeUserManager*>(
         user_manager::UserManager::Get());
   }
 
diff --git a/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc b/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc
index 5793068..edf428d2 100644
--- a/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc
+++ b/chrome/browser/extensions/external_provider_impl_chromeos_unittest.cc
@@ -11,7 +11,6 @@
 #include "chrome/browser/chrome_notification_types.h"
 #include "chrome/browser/chromeos/app_mode/kiosk_app_manager.h"
 #include "chrome/browser/chromeos/customization/customization_document.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/extensions/extension_service.h"
 #include "chrome/browser/extensions/extension_service_test_base.h"
@@ -21,6 +20,7 @@
 #include "chrome/test/base/testing_profile.h"
 #include "chromeos/system/fake_statistics_provider.h"
 #include "chromeos/system/statistics_provider.h"
+#include "components/user_manager/fake_user_manager.h"
 #include "content/public/browser/notification_service.h"
 #include "content/public/test/test_utils.h"
 
@@ -33,9 +33,8 @@ const char kExternalAppId[] = "kekdneafjmhmndejhmbcadfiiofngffo";
 class ExternalProviderImplChromeOSTest : public ExtensionServiceTestBase {
  public:
   ExternalProviderImplChromeOSTest()
-      : fake_user_manager_(new chromeos::FakeUserManager()),
-        scoped_user_manager_(fake_user_manager_) {
-  }
+      : fake_user_manager_(new user_manager::FakeUserManager()),
+        scoped_user_manager_(fake_user_manager_) {}
 
   ~ExternalProviderImplChromeOSTest() override {}
 
@@ -75,7 +74,7 @@ class ExternalProviderImplChromeOSTest : public ExtensionServiceTestBase {
   TestingPrefServiceSimple local_state_;
   scoped_ptr<base::ScopedPathOverride> external_externsions_overrides_;
   chromeos::system::ScopedFakeStatisticsProvider fake_statistics_provider_;
-  chromeos::FakeUserManager* fake_user_manager_;
+  user_manager::FakeUserManager* fake_user_manager_;
   chromeos::ScopedUserManagerEnabler scoped_user_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(ExternalProviderImplChromeOSTest);
diff --git a/chrome/browser/extensions/external_provider_impl_unittest.cc b/chrome/browser/extensions/external_provider_impl_unittest.cc
index 011d032..486eac6 100644
--- a/chrome/browser/extensions/external_provider_impl_unittest.cc
+++ b/chrome/browser/extensions/external_provider_impl_unittest.cc
@@ -33,10 +33,10 @@
 
 #if defined(OS_CHROMEOS)
 #include "chrome/browser/chromeos/customization/customization_document.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chromeos/system/fake_statistics_provider.h"
 #include "chromeos/system/statistics_provider.h"
+#include "components/user_manager/fake_user_manager.h"
 #endif
 
 using ::testing::NotNull;
@@ -60,7 +60,7 @@ class ExternalProviderImplTest : public ExtensionServiceTestBase {
   void InitServiceWithExternalProviders() {
 #if defined(OS_CHROMEOS)
     chromeos::ScopedUserManagerEnabler scoped_user_manager(
-        new chromeos::FakeUserManager);
+        new user_manager::FakeUserManager);
 #endif
     InitializeExtensionServiceWithUpdaterAndPrefs();
 
diff --git a/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc b/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc
index 2bd9218..8970757 100644
--- a/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc
+++ b/chrome/browser/metrics/chromeos_metrics_provider_unittest.cc
@@ -7,7 +7,7 @@
 #include <string>
 
 #include "base/basictypes.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/metrics/chromeos_metrics_provider.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
@@ -120,7 +120,8 @@ TEST_F(ChromeOSMetricsProviderTest, MultiProfileUserCount) {
   std::string user3("user3@example.com");
 
   // |scoped_enabler| takes over the lifetime of |user_manager|.
-  chromeos::FakeUserManager* user_manager = new chromeos::FakeUserManager();
+  chromeos::FakeChromeUserManager* user_manager =
+      new chromeos::FakeChromeUserManager();
   chromeos::ScopedUserManagerEnabler scoped_enabler(user_manager);
   user_manager->AddKioskAppUser(user1);
   user_manager->AddKioskAppUser(user2);
@@ -142,7 +143,8 @@ TEST_F(ChromeOSMetricsProviderTest, MultiProfileCountInvalidated) {
   std::string user3("user3@example.com");
 
   // |scoped_enabler| takes over the lifetime of |user_manager|.
-  chromeos::FakeUserManager* user_manager = new chromeos::FakeUserManager();
+  chromeos::FakeChromeUserManager* user_manager =
+      new chromeos::FakeChromeUserManager();
   chromeos::ScopedUserManagerEnabler scoped_enabler(user_manager);
   user_manager->AddKioskAppUser(user1);
   user_manager->AddKioskAppUser(user2);
diff --git a/chrome/browser/notifications/message_center_settings_controller_unittest.cc b/chrome/browser/notifications/message_center_settings_controller_unittest.cc
index 4b44208..cd8e18b 100644
--- a/chrome/browser/notifications/message_center_settings_controller_unittest.cc
+++ b/chrome/browser/notifications/message_center_settings_controller_unittest.cc
@@ -21,7 +21,7 @@
 
 #if defined(OS_CHROMEOS)
 #include "ash/system/system_notifier.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #endif
 
@@ -74,8 +74,8 @@ class MessageCenterSettingsControllerChromeOSTest
     MessageCenterSettingsControllerBaseTest::SetUp();
 
     // Initialize the UserManager singleton to a fresh FakeUserManager instance.
-    user_manager_enabler_.reset(
-        new chromeos::ScopedUserManagerEnabler(new chromeos::FakeUserManager));
+    user_manager_enabler_.reset(new chromeos::ScopedUserManagerEnabler(
+        new chromeos::FakeChromeUserManager));
   }
 
   void TearDown() override {
@@ -98,8 +98,8 @@ class MessageCenterSettingsControllerChromeOSTest
   }
 
  private:
-  chromeos::FakeUserManager* GetFakeUserManager() {
-    return static_cast<chromeos::FakeUserManager*>(
+  chromeos::FakeChromeUserManager* GetFakeUserManager() {
+    return static_cast<chromeos::FakeChromeUserManager*>(
         user_manager::UserManager::Get());
   }
 
diff --git a/chrome/browser/profiles/profile_manager_unittest.cc b/chrome/browser/profiles/profile_manager_unittest.cc
index 89238a2..48463fa 100644
--- a/chrome/browser/profiles/profile_manager_unittest.cc
+++ b/chrome/browser/profiles/profile_manager_unittest.cc
@@ -44,7 +44,7 @@
 #include "ui/base/l10n/l10n_util.h"
 
 #if defined(OS_CHROMEOS)
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_test_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
@@ -222,7 +222,8 @@ TEST_F(ProfileManagerTest, LoggedInProfileDir) {
             profile_manager->GetInitialProfileDir().value());
 
   const char kTestUserName[] = "test-user@example.com";
-  chromeos::FakeUserManager* user_manager = new chromeos::FakeUserManager();
+  chromeos::FakeChromeUserManager* user_manager =
+      new chromeos::FakeChromeUserManager();
   chromeos::ScopedUserManagerEnabler enabler(user_manager);
 
   const user_manager::User* active_user = user_manager->AddUser(kTestUserName);
diff --git a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
index 930954b..504d04e 100644
--- a/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
+++ b/chrome/browser/ui/ash/launcher/chrome_launcher_controller_unittest.cc
@@ -50,7 +50,7 @@
 #include "ash/test/test_session_state_delegate.h"
 #include "ash/test/test_shell_delegate.h"
 #include "chrome/browser/apps/scoped_keep_alive.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/ui/apps/chrome_app_delegate.h"
 #include "chrome/browser/ui/ash/launcher/app_window_launcher_controller.h"
@@ -62,6 +62,7 @@
 #include "chrome/common/chrome_switches.h"
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile_manager.h"
+#include "components/user_manager/fake_user_manager.h"
 #include "content/public/browser/web_contents_observer.h"
 #include "content/public/test/test_utils.h"
 #include "extensions/browser/app_window/app_window_contents.h"
@@ -779,8 +780,8 @@ class MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest
     profile_manager_->SetLoggedIn(true);
 
     // Initialize the UserManager singleton to a fresh FakeUserManager instance.
-    user_manager_enabler_.reset(
-        new chromeos::ScopedUserManagerEnabler(new chromeos::FakeUserManager));
+    user_manager_enabler_.reset(new chromeos::ScopedUserManagerEnabler(
+        new chromeos::FakeChromeUserManager));
 
     // Initialize the rest.
     ChromeLauncherControllerTest::SetUp();
@@ -906,8 +907,8 @@ class MultiProfileMultiBrowserShelfLayoutChromeLauncherControllerTest
   typedef std::map<Profile*, std::string> ProfileToNameMap;
   TestingProfileManager* profile_manager() { return profile_manager_.get(); }
 
-  chromeos::FakeUserManager* GetFakeUserManager() {
-    return static_cast<chromeos::FakeUserManager*>(
+  chromeos::FakeChromeUserManager* GetFakeUserManager() {
+    return static_cast<chromeos::FakeChromeUserManager*>(
         user_manager::UserManager::Get());
   }
 
diff --git a/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc b/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc
index 8f0b79f..37da1a4 100644
--- a/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/session_state_delegate_chromeos_unittest.cc
@@ -8,7 +8,7 @@
 #include <vector>
 
 #include "base/run_loop.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
 #include "chrome/browser/chromeos/policy/policy_cert_service.h"
@@ -50,8 +50,9 @@ class SessionStateDelegateChromeOSTest : public testing::Test {
   ~SessionStateDelegateChromeOSTest() override {}
 
   void SetUp() override {
-    // Initialize the UserManager singleton to a fresh FakeUserManager instance.
-    user_manager_ = new chromeos::FakeUserManager;
+    // Initialize the UserManager singleton to a fresh FakeChromeUserManager
+    // instance.
+    user_manager_ = new FakeChromeUserManager;
     user_manager_enabler_.reset(
         new chromeos::ScopedUserManagerEnabler(user_manager_));
 
@@ -89,7 +90,7 @@ class SessionStateDelegateChromeOSTest : public testing::Test {
     return user_manager::UserManager::Get()->GetActiveUser()->email();
   }
 
-  chromeos::FakeUserManager* user_manager() { return user_manager_; }
+  FakeChromeUserManager* user_manager() { return user_manager_; }
   SessionStateDelegateChromeos* session_state_delegate() {
     return session_state_delegate_.get();
   }
@@ -119,7 +120,7 @@ class SessionStateDelegateChromeOSTest : public testing::Test {
   scoped_ptr<SessionStateDelegateChromeos> session_state_delegate_;
 
   // Not owned.
-  chromeos::FakeUserManager* user_manager_;
+  FakeChromeUserManager* user_manager_;
 
   DISALLOW_COPY_AND_ASSIGN(SessionStateDelegateChromeOSTest);
 };
diff --git a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
index f22a690..a667821 100644
--- a/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/gaia_screen_handler.cc
@@ -16,6 +16,7 @@
 #include "chrome/browser/chromeos/language_preferences.h"
 #include "chrome/browser/chromeos/login/startup_utils.h"
 #include "chrome/browser/chromeos/login/ui/user_adding_screen.h"
+#include "chrome/browser/chromeos/login/users/chrome_user_manager.h"
 #include "chrome/browser/chromeos/policy/consumer_management_service.h"
 #include "chrome/browser/chromeos/policy/consumer_management_stage.h"
 #include "chrome/browser/chromeos/profiles/profile_helper.h"
@@ -79,7 +80,7 @@ void UpdateAuthParams(base::DictionaryValue* params,
     message_id = IDS_CREATE_SUPERVISED_USER_CREATION_RESTRICTED_TEXT;
   }
   if (supervised_users_can_create &&
-      user_manager::UserManager::Get()
+      ChromeUserManager::Get()
           ->GetUsersAllowedForSupervisedUsersCreation()
           .empty()) {
     supervised_users_can_create = false;
diff --git a/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc b/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc
index 34925a6..2846abd 100644
--- a/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc
+++ b/chrome/browser/ui/webui/chromeos/login/signin_userlist_unittest.cc
@@ -4,7 +4,7 @@
 
 #include "base/compiler_specific.h"
 #include "chrome/browser/chromeos/login/screens/user_selection_screen.h"
-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"
+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"
 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller.h"
 #include "chrome/browser/chromeos/login/users/multi_profile_user_controller_delegate.h"
 #include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"
@@ -35,9 +35,8 @@ class SigninPrepareUserListTest
       public MultiProfileUserControllerDelegate {
  public:
   SigninPrepareUserListTest()
-      : fake_user_manager_(new FakeUserManager()),
-        user_manager_enabler_(fake_user_manager_) {
-  }
+      : fake_user_manager_(new FakeChromeUserManager()),
+        user_manager_enabler_(fake_user_manager_) {}
 
   ~SigninPrepareUserListTest() override {}
 
@@ -66,7 +65,7 @@ class SigninPrepareUserListTest
   // MultiProfileUserControllerDelegate overrides:
   void OnUserNotAllowed(const std::string& user_email) override {}
 
-  FakeUserManager* fake_user_manager_;
+  FakeChromeUserManager* fake_user_manager_;
   ScopedUserManagerEnabler user_manager_enabler_;
   scoped_ptr<TestingProfileManager> profile_manager_;
   std::map<std::string,
diff --git a/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc b/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc
index 0bb7b32..7f0ad01 100644
--- a/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc
+++ b/chrome/browser/ui/webui/chromeos/login/supervised_user_creation_screen_handler.cc
@@ -211,8 +211,7 @@ void SupervisedUserCreationScreenHandler::Show() {
   scoped_ptr<base::DictionaryValue> data(new base::DictionaryValue());
   scoped_ptr<base::ListValue> users_list(new base::ListValue());
   const user_manager::UserList& users =
-      user_manager::UserManager::Get()
-          ->GetUsersAllowedForSupervisedUsersCreation();
+      ChromeUserManager::Get()->GetUsersAllowedForSupervisedUsersCreation();
   std::string owner;
   chromeos::CrosSettings::Get()->GetString(chromeos::kDeviceOwner, &owner);