Make FakeChromeUserManager subclass of ChromeUserManager

chrome/browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc

Index: chrome/browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc
index d621c9532be9023770b6ca77e7663c6d5e9a8a49..bcb97bf92d7bc401ac662ecc7f430d407be549fb 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 #include "ash/test/ash_test_base.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/signin/account_tracker_service_factory.h"
@@ -12,7 +13,6 @@
 #include "chrome/test/base/testing_profile.h"
 #include "components/signin/core/account_id/account_id.h"
 #include "components/signin/core/browser/account_tracker_service.h"
-#include "components/user_manager/fake_user_manager.h"
 #include "components/user_manager/user.h"
 
 namespace ash {
@@ -58,7 +58,7 @@ class MultiUserUtilTest : public AshTestBase {
   void SetUp() override {
     AshTestBase::SetUp();
 
-    fake_user_manager_ = new user_manager::FakeUserManager;
+    fake_user_manager_ = new chromeos::FakeChromeUserManager;
     user_manager_enabler_.reset(
         new chromeos::ScopedUserManagerEnabler(fake_user_manager_));
 
@@ -105,7 +105,7 @@ class MultiUserUtilTest : public AshTestBase {
 
  private:
   std::unique_ptr<MultiUserTestingProfile> profile_;
-  user_manager::FakeUserManager* fake_user_manager_;  // Not owned.
+  chromeos::FakeChromeUserManager* fake_user_manager_;  // Not owned.

[msw, 2016/11/17 18:31:22]

nit: okay, this one is used; it'd be nice to either (1) still inline the manager
instantiation in the enabler ctor and provide an accessor on the enabler to get
the manager, or (2) replace the "Not owned." comment here with something more
useful, like "Owned by |user_manager_enabler_|."

[yoshiki, 2016/11/18 15:54:15]

Done.

   std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
 
   DISALLOW_COPY_AND_ASSIGN(MultiUserUtilTest);