chrome/browser/policy/device_status_collector_browsertest.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_status_collector_browsertest.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_status_collector_browsertest.cc

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

index 672489a2d2291e0d7ed87d374e2aefcd2a25304c..fc2ae01b76aa5a0602480dbafb1ae4237ef7695e 100644

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

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

@@ -143,7 +143,7 @@ class DeviceStatusCollectorTest : public testing::Test {

scoped_ptr<base::Environment> env(base::Environment::Create());

env->SetVar("TZ", "UTC");

- TestingDeviceStatusCollector::RegisterPrefs(&prefs_);

+ TestingDeviceStatusCollector::RegisterPrefs(prefs_.registry());

EXPECT_CALL(statistics_provider_, GetMachineStatistic(_, NotNull()))

.WillRepeatedly(Return(false));

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