chrome/browser/policy/device_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/device_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

Index: chrome/browser/policy/device_cloud_policy_manager_chromeos_unittest.cc

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

index c2299b806869f1eb1a75b664ae00e4a08a6e1d4f..cc932a7418ac51ffc0fc03e271b0cb513b8dd610 100644

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

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

@@ -17,6 +17,7 @@

#include "chrome/browser/policy/proto/chrome_device_policy.pb.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"

@@ -46,7 +47,7 @@ class DeviceCloudPolicyManagerChromeOSTest

virtual void SetUp() OVERRIDE {

DeviceSettingsTestBase::SetUp();

- chrome::RegisterLocalState(&local_state_);

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

manager_.Init();

}

« no previous file with comments | « chrome/browser/policy/cloud_policy_core_unittest.cc ('k') | chrome/browser/policy/device_status_collector.h » ('j') | no next file with comments »