chrome/browser/ui/ash/multi_user/multi_user_context_menu_chromeos_unittest.cc - Issue 2504513002: Make FakeChromeUserManager subclass of ChromeUserManager

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 comments 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

« no previous file with comments | « chrome/browser/extensions/external_provider_impl_unittest.cc ('k') | chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc » ('j') | chrome/browser/ui/ash/multi_user/multi_user_notification_blocker_chromeos_unittest.cc » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

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..d683e62cc2ce3bbb61508996dd1890988f2358f9 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,7 +29,7 @@ class MultiUserContextMenuChromeOSTest : public AshTestBase {

public:

MultiUserContextMenuChromeOSTest()

: multi_user_window_manager_(NULL),

- fake_user_manager_(new user_manager::FakeUserManager),

+ fake_user_manager_(new chromeos::FakeChromeUserManager),

user_manager_enabler_(fake_user_manager_) {}

void SetUp() override;

@@ -50,7 +50,7 @@ class MultiUserContextMenuChromeOSTest : public AshTestBase {

// The instance of the MultiUserWindowManager.

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 nit: this value isn't ever used after being set; i

yoshiki 2016/11/18 15:54:15 Done.

chromeos::ScopedUserManagerEnabler user_manager_enabler_;

DISALLOW_COPY_AND_ASSIGN(MultiUserContextMenuChromeOSTest);