chrome/browser/chromeos/login/user_manager_unittest.cc - Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable.

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/login/user_manager_unittest.cc

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 8 years 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

Index: chrome/browser/chromeos/login/user_manager_unittest.cc

diff --git a/chrome/browser/chromeos/login/user_manager_unittest.cc b/chrome/browser/chromeos/login/user_manager_unittest.cc

index a19d1195f6ba5b1e30fb1dd74057abea590519a7..475ad119ae391ce26da42b91e490cbf6ce95b67a 100644

--- a/chrome/browser/chromeos/login/user_manager_unittest.cc

+++ b/chrome/browser/chromeos/login/user_manager_unittest.cc

@@ -57,7 +57,7 @@ class UserManagerTest : public testing::Test {

SetDeviceSettings(false, "");

// Register an in-memory local settings instance.

- local_state_.reset(new TestingPrefService);

+ local_state_.reset(new TestingPrefServiceSimple);

reinterpret_cast<TestingBrowserProcess*>(g_browser_process)

->SetLocalState(local_state_.get());

UserManager::RegisterPrefs(local_state_.get());

@@ -141,7 +141,7 @@ class UserManagerTest : public testing::Test {

CrosSettings* cros_settings_;

CrosSettingsProvider* device_settings_provider_;

StubCrosSettingsProvider stub_settings_provider_;

- scoped_ptr<TestingPrefService> local_state_;

+ scoped_ptr<TestingPrefServiceSimple> local_state_;

// Initializes / shuts down a stub CrosLibrary.

chromeos::ScopedStubCrosEnabler stub_cros_enabler_;

« no previous file with comments | « chrome/browser/chromeos/login/user_manager_impl.cc ('k') | chrome/browser/chromeos/login/wallpaper_manager.h » ('j') | no next file with comments »