chrome/browser/chromeos/input_method/input_method_persistence_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/input_method/input_method_persistence_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/chromeos/file_system_provider/service_unittest.cc ('k') | chrome/browser/chromeos/login/auth/cryptohome_authenticator_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc

diff --git a/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc b/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc

index 35f36c3e86396341684b762d40c9091b3bb914f7..2d071bfd962198be2e3796bd4aabd404ed601828 100644

--- a/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc

+++ b/chrome/browser/chromeos/input_method/input_method_persistence_unittest.cc

@@ -8,7 +8,7 @@

#include "base/prefs/pref_service.h"

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

#include "chrome/browser/chromeos/language_preferences.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/profiles/profile_helper.h"

#include "chrome/browser/profiles/profile_manager.h"

@@ -35,7 +35,7 @@ class InputMethodPersistenceTest : public testing::Test {

protected:

InputMethodPersistenceTest()

: mock_profile_manager_(TestingBrowserProcess::GetGlobal()),

- fake_user_manager_(new chromeos::FakeUserManager()),

+ fake_user_manager_(new chromeos::FakeChromeUserManager()),

user_manager_enabler_(fake_user_manager_) {}

void SetUp() override {

@@ -71,7 +71,7 @@ class InputMethodPersistenceTest : public testing::Test {

TestingPrefServiceSyncable* mock_user_prefs_;

MockInputMethodManager mock_manager_;

TestingProfileManager mock_profile_manager_;

- chromeos::FakeUserManager* fake_user_manager_;

+ chromeos::FakeChromeUserManager* fake_user_manager_;

chromeos::ScopedUserManagerEnabler user_manager_enabler_;

};