Make FakeChromeUserManager subclass of ChromeUserManager

chrome/browser/ui/browser_finder_chromeos_unittest.cc

Index: chrome/browser/ui/browser_finder_chromeos_unittest.cc
diff --git a/chrome/browser/ui/browser_finder_chromeos_unittest.cc b/chrome/browser/ui/browser_finder_chromeos_unittest.cc
index 93525ef42865b5450133aaffbc610a6ddea02a11..7b56dc779b349f2984af907a80831bbc05f2a21e 100644
--- a/chrome/browser/ui/browser_finder_chromeos_unittest.cc
+++ b/chrome/browser/ui/browser_finder_chromeos_unittest.cc
@@ -8,6 +8,7 @@
 #include "ash/shell.h"
 #include "ash/test/ash_test_helper.h"
 #include "base/macros.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/profiles/profile_helper.h"
@@ -18,7 +19,6 @@
 #include "chrome/test/base/testing_browser_process.h"
 #include "chrome/test/base/testing_profile_manager.h"
 #include "components/signin/core/account_id/account_id.h"
-#include "components/user_manager/fake_user_manager.h"
 #include "components/user_manager/user.h"
 
 namespace test {
@@ -34,7 +34,7 @@ class BrowserFinderChromeOSTest : public BrowserWithTestWindowTest {
  protected:
   BrowserFinderChromeOSTest()
       : multi_user_window_manager_(nullptr),
-        fake_user_manager_(new user_manager::FakeUserManager),
+        fake_user_manager_(new chromeos::FakeChromeUserManager),
         user_manager_enabler_(fake_user_manager_) {}
 
   TestingProfile* CreateMultiUserProfile(const AccountId& account_id) {
@@ -100,7 +100,7 @@ class BrowserFinderChromeOSTest : public BrowserWithTestWindowTest {
   TestingProfile* second_profile_;
   std::unique_ptr<TestingProfileManager> profile_manager_;
   chrome::MultiUserWindowManagerChromeOS* multi_user_window_manager_;
-  user_manager::FakeUserManager* fake_user_manager_;  // Not owned.
+  chromeos::FakeChromeUserManager* fake_user_manager_;  // Not owned.

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

ditto nit

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

Done.

   chromeos::ScopedUserManagerEnabler user_manager_enabler_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserFinderChromeOSTest);