Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(161)

Unified Diff: chrome/browser/ui/ash/multi_user/multi_user_util_chromeos_unittest.cc

Issue 2504513002: Make FakeChromeUserManager subclass of ChromeUserManager (Closed)
Patch Set: Addressed comment Created 4 years, 1 month ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
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..ac60dd9d6aaacecd981e9bf49152258df36d1f32 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,8 @@ class MultiUserUtilTest : public AshTestBase {
private:
std::unique_ptr<MultiUserTestingProfile> profile_;
- user_manager::FakeUserManager* fake_user_manager_; // Not owned.
+ // |fake_user_manager_| is owned by |user_manager_enabler_|.
+ chromeos::FakeChromeUserManager* fake_user_manager_;
std::unique_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;
DISALLOW_COPY_AND_ASSIGN(MultiUserUtilTest);

Powered by Google App Engine
This is Rietveld 408576698