chrome/browser/notifications/message_center_settings_controller_unittest.cc - Issue 444903002: [cros] user_manager component - move UserManagerBase and UserManager

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 444903002: [cros] user_manager component - move UserManagerBase and UserManager (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: rebase Created 6 years, 4 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/notifications/message_center_settings_controller.cc ('k') | chrome/browser/performance_monitor/performance_monitor_browsertest.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 9046e5881a3b63588ee43874e7a28a782dcc6116..750f29f47c5fbfcc37485bd2d16b7ceee19a460a 100644

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

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

@@ -18,6 +18,7 @@

#if defined(OS_CHROMEOS)

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

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

#endif

class MessageCenterSettingsControllerTest : public testing::Test {

@@ -96,7 +97,7 @@ class MessageCenterSettingsControllerChromeOSTest

private:

chromeos::FakeUserManager* GetFakeUserManager() {

return static_cast<chromeos::FakeUserManager*>(

- chromeos::UserManager::Get());

+ user_manager::UserManager::Get());

}

scoped_ptr<chromeos::ScopedUserManagerEnabler> user_manager_enabler_;