chrome/browser/policy/user_cloud_policy_manager_chromeos_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/user_cloud_policy_manager_chromeos_unittest.cc

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

Patch Set: Fix double registration in Chrome Frame test. Created 7 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/policy/url_blacklist_manager_unittest.cc ('k') | chrome/browser/policy/user_policy_signin_service_unittest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/policy/user_cloud_policy_manager_chromeos_unittest.cc

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

index ff34664138b123e4b9329d83b35f959bf1ce6c21..6aca509cfaf748340b7e17910bb862a873e7964f 100644

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

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

@@ -13,6 +13,7 @@

#include "chrome/browser/policy/mock_device_management_service.h"

#include "chrome/browser/policy/proto/device_management_backend.pb.h"

#include "chrome/browser/prefs/browser_prefs.h"

+#include "chrome/browser/prefs/pref_registry_simple.h"

#include "chrome/test/base/testing_pref_service.h"

#include "policy/policy_constants.h"

#include "testing/gmock/include/gmock/gmock.h"

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

: store_(NULL) {}

virtual void SetUp() OVERRIDE {

- chrome::RegisterLocalState(&prefs_);

+ chrome::RegisterLocalState(prefs_.registry(), &prefs_);

// Set up a policy map for testing.

policy_map_.Set("key", POLICY_LEVEL_MANDATORY, POLICY_SCOPE_USER,