chrome/browser/chromeos/preferences_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/chromeos/preferences_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:

Index: chrome/browser/chromeos/preferences_unittest.cc

diff --git a/chrome/browser/chromeos/preferences_unittest.cc b/chrome/browser/chromeos/preferences_unittest.cc

index b4f6c9540e959f49923bf7de26d33d556c9b46e4..b58fb5d2ef71e355c75d1e9bac14db830209e9f6 100644

--- a/chrome/browser/chromeos/preferences_unittest.cc

+++ b/chrome/browser/chromeos/preferences_unittest.cc

@@ -11,7 +11,7 @@

#include "chrome/browser/chromeos/input_method/input_method_configuration.h"

#include "chrome/browser/chromeos/input_method/mock_input_method_manager.h"

#include "chrome/browser/chromeos/login/session/user_session_manager.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"

#include "chrome/browser/chromeos/system/fake_input_device_settings.h"

#include "chrome/common/chrome_constants.h"

@@ -149,7 +149,8 @@ class PreferencesTest : public testing::Test {

new TestingProfileManager(TestingBrowserProcess::GetGlobal()));

ASSERT_TRUE(profile_manager_->SetUp());

- chromeos::FakeUserManager* user_manager = new chromeos::FakeUserManager();

+ chromeos::FakeChromeUserManager* user_manager =

+ new chromeos::FakeChromeUserManager();

user_manager_enabler_.reset(

new chromeos::ScopedUserManagerEnabler(user_manager));