chrome/browser/notifications/message_center_settings_controller_unittest.cc - Issue 824683002: UserManager stack refactoring.

Keyboard Shortcuts

	File
u :	up to issue
j / k :	jump to file after / before current file
J / K :	jump to next file with a comment after / before current file
	Side-by-side diff
i :	toggle intra-line diffs
e :	expand all comments
c :	collapse all comments
s :	toggle showing all comments
n / p :	next / previous diff chunk or comment
N / P :	next / previous comment
<Up> / <Down> :	next / previous line

	Issue
u :	up to list of issues
j / k :	jump to patch after / before current patch
o / <Enter> :	open current patch in side-by-side view
i :	open current patch in unified diff view

	Issue List
j / k :	jump to issue after / before current issue
o / <Enter> :	open current issue

Unified Diff: chrome/browser/notifications/message_center_settings_controller_unittest.cc

Issue 824683002: UserManager stack refactoring. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Test fixed. Created 5 years, 10 months 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

« no previous file with comments | « chrome/browser/metrics/chromeos_metrics_provider_unittest.cc ('k') | chrome/browser/profiles/profile_manager_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/notifications/message_center_settings_controller_unittest.cc

diff --git a/chrome/browser/notifications/message_center_settings_controller_unittest.cc b/chrome/browser/notifications/message_center_settings_controller_unittest.cc

index 4b4420839638edcb4525b06ef9e590b4186b705b..cd8e18b8656882e7d73ce10fbe188fce2bd271a4 100644

--- a/chrome/browser/notifications/message_center_settings_controller_unittest.cc

+++ b/chrome/browser/notifications/message_center_settings_controller_unittest.cc

@@ -21,7 +21,7 @@

#if defined(OS_CHROMEOS)

#include "ash/system/system_notifier.h"

-#include "chrome/browser/chromeos/login/users/fake_user_manager.h"

+#include "chrome/browser/chromeos/login/users/fake_chrome_user_manager.h"

#include "chrome/browser/chromeos/login/users/scoped_user_manager_enabler.h"

#endif

@@ -74,8 +74,8 @@ class MessageCenterSettingsControllerChromeOSTest

MessageCenterSettingsControllerBaseTest::SetUp();

// Initialize the UserManager singleton to a fresh FakeUserManager instance.

- user_manager_enabler_.reset(

- new chromeos::ScopedUserManagerEnabler(new chromeos::FakeUserManager));

+ user_manager_enabler_.reset(new chromeos::ScopedUserManagerEnabler(

+ new chromeos::FakeChromeUserManager));

}

void TearDown() override {

@@ -98,8 +98,8 @@ class MessageCenterSettingsControllerChromeOSTest

}

private:

- chromeos::FakeUserManager* GetFakeUserManager() {

- return static_cast<chromeos::FakeUserManager*>(

+ chromeos::FakeChromeUserManager* GetFakeUserManager() {

+ return static_cast<chromeos::FakeChromeUserManager*>(

user_manager::UserManager::Get());

}