chrome/browser/policy/cloud_policy_subsystem_unittest.cc - Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple.

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/policy/cloud_policy_subsystem_unittest.cc

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 12 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/policy/cloud_policy_subsystem.cc ('k') | chrome/browser/policy/device_status_collector.h » ('j') | chrome/browser/prefs/pref_registrar_simple.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/cloud_policy_subsystem_unittest.cc

diff --git a/chrome/browser/policy/cloud_policy_subsystem_unittest.cc b/chrome/browser/policy/cloud_policy_subsystem_unittest.cc

index 12147c9d5e3819d45388a53bb770d1e66923b30c..cd00ae29bedf4a3a22a17e2523b2d2eba3dbcc30 100644

--- a/chrome/browser/policy/cloud_policy_subsystem_unittest.cc

+++ b/chrome/browser/policy/cloud_policy_subsystem_unittest.cc

@@ -116,7 +116,7 @@ class CloudPolicySubsystemTestBase : public testing::Test {

virtual void SetUp() {

prefs_.reset(new TestingPrefServiceSimple);

- CloudPolicySubsystem::RegisterPrefs(prefs_.get());

+ CloudPolicySubsystem::RegisterPrefs(prefs_->registrar());

((TestingBrowserProcess*) g_browser_process)->SetLocalState(prefs_.get());

logger_.reset(new EventLogger);

@@ -255,7 +255,7 @@ class CloudPolicySubsystemTestBase : public testing::Test {

scoped_ptr<EventLogger> logger_;

scoped_ptr<CloudPolicyDataStore> data_store_;

scoped_ptr<CloudPolicySubsystem> cloud_policy_subsystem_;

- scoped_ptr<PrefServiceSimple> prefs_;

+ scoped_ptr<TestingPrefServiceSimple> prefs_;

CloudPolicyCacheBase* cache_;

scoped_ptr<TestingPolicyURLFetcherFactory> factory_;