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

Unified Diff: chrome/browser/ui/ash/multi_user/multi_user_context_menu_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_context_menu_chromeos_unittest.cc
diff --git a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc
index 16386bb92c0be3203c456b4493609c8cbdcca272..c54916735870ef63afa775bba83009f1a497f365 100644
--- a/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc
+++ b/chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc
@@ -10,13 +10,13 @@
#include "base/compiler_specific.h"
#include "base/logging.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/ui/ash/multi_user/multi_user_context_menu.h"
#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager.h"
#include "chrome/browser/ui/ash/multi_user/multi_user_window_manager_chromeos.h"
#include "chrome/common/chrome_switches.h"
#include "components/signin/core/account_id/account_id.h"
-#include "components/user_manager/fake_user_manager.h"
#include "ui/aura/window.h"
#include "ui/base/models/menu_model.h"
#include "ui/base/ui_base_types.h"
@@ -29,8 +29,7 @@ class MultiUserContextMenuChromeOSTest : public AshTestBase {
public:
MultiUserContextMenuChromeOSTest()
: multi_user_window_manager_(NULL),
- fake_user_manager_(new user_manager::FakeUserManager),
- user_manager_enabler_(fake_user_manager_) {}
+ user_manager_enabler_(new chromeos::FakeChromeUserManager) {}
void SetUp() override;
void TearDown() override;
@@ -50,7 +49,6 @@ class MultiUserContextMenuChromeOSTest : public AshTestBase {
// The instance of the MultiUserWindowManager.
chrome::MultiUserWindowManagerChromeOS* multi_user_window_manager_;
- user_manager::FakeUserManager* fake_user_manager_; // Not owned.
chromeos::ScopedUserManagerEnabler user_manager_enabler_;
DISALLOW_COPY_AND_ASSIGN(MultiUserContextMenuChromeOSTest);

Powered by Google App Engine
This is Rietveld 408576698