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

Unified Diff: chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_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_notification_blocker_chromeos_unittest.cc
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc
index 55ecb75c6193940ecb66a22310a3ad26a7fd462a..c4a166587ec4b2bd370feebef85a3033b0e004ad 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc
@@ -10,6 +10,7 @@
#include "ash/test/test_shell_delegate.h"
#include "base/macros.h"
#include "base/strings/utf_string_conversions.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/ui/ash/multi_user/multi_user_notification_blocker_chromeos.h"
@@ -17,7 +18,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_info.h"
#include "ui/message_center/message_center.h"
#include "ui/message_center/notification.h"
@@ -32,8 +32,7 @@ class MultiUserNotificationBlockerChromeOSTest
: state_changed_count_(0),
testing_profile_manager_(TestingBrowserProcess::GetGlobal()),
window_id_(0),
- fake_user_manager_(new user_manager::FakeUserManager),
- user_manager_enabler_(fake_user_manager_) {}
+ user_manager_enabler_(new chromeos::FakeChromeUserManager) {}
~MultiUserNotificationBlockerChromeOSTest() override {}
// ash::test::AshTestBase overrides:
@@ -156,8 +155,6 @@ class MultiUserNotificationBlockerChromeOSTest
TestingProfileManager testing_profile_manager_;
int window_id_;
- user_manager::FakeUserManager* fake_user_manager_; // Not owned.
-
chromeos::ScopedUserManagerEnabler user_manager_enabler_;
DISALLOW_COPY_AND_ASSIGN(MultiUserNotificationBlockerChromeOSTest);

Powered by Google App Engine
This is Rietveld 408576698