Make FakeChromeUserManager subclass of ChromeUserManager

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

 // Copyright 2016 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 "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"
 #include "chrome/browser/signin/fake_signin_manager_builder.h"
 #include "chrome/browser/signin/signin_manager_factory.h"
 #include "chrome/browser/ui/ash/multi_user/multi_user_util.h"
 #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 {
 namespace test {
 
 namespace {
 
 const char kTestGaiaId[] = "gaia_id";
 const char kTestAccountId[] = "test@test.com";
 
@@ skipping 25 matching lines @@
 }  // namespace
 
 class MultiUserUtilTest : public AshTestBase {
  public:
   MultiUserUtilTest() {}
   ~MultiUserUtilTest() override{};
 
   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_));
 
     TestingProfile::Builder builder;
     builder.AddTestingFactory(SigninManagerFactory::GetInstance(),
                               BuildFakeSigninManagerBase);
     TestingProfile* profile = builder.Build().release();
     profile_.reset(new MultiUserTestingProfile(profile));
   }
 
@@ skipping 26 matching lines @@
   void SimulateTokenRevoked(const std::string& account_id) {
     AccountTrackerService* account_tracker_service =
         AccountTrackerServiceFactory::GetForProfile(profile_->profile());
     account_tracker_service->RemoveAccount(account_id);
   }
 
   MultiUserTestingProfile* profile() { return profile_.get(); }
 
  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);
 };
 
 // Test that during the session it will always return a valid account id if a
 // valid profile is provided, even if this profile's refresh token has been
 // revoked. (On Chrome OS we don't force to end the session in this case.)
 TEST_F(MultiUserUtilTest, ReturnValidAccountIdIfTokenRevoked) {
   std::string id = AddUserToAccountTracker(kTestGaiaId, kTestAccountId);
   EXPECT_EQ(kTestAccountId, profile()->GetProfileUserName());
   EXPECT_EQ(kTestAccountId,
             multi_user_util::GetAccountIdFromProfile(profile()).GetUserEmail());
 
   SimulateTokenRevoked(id);
   EXPECT_EQ(std::string(), profile()->GetProfileUserName());
   EXPECT_EQ(kTestAccountId,
             multi_user_util::GetAccountIdFromProfile(profile()).GetUserEmail());
 }
 
 }  // namespace test
 }  // namespace ash