chrome/browser/notifications/desktop_notifications_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/notifications/desktop_notifications_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/net/ssl_config_service_manager_pref_unittest.cc ('k') | chrome/browser/notifications/notification_prefs_manager.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/notifications/desktop_notifications_unittest.cc

diff --git a/chrome/browser/notifications/desktop_notifications_unittest.cc b/chrome/browser/notifications/desktop_notifications_unittest.cc

index a78b946fbedf4ad6ec346b698416a8bab2148bce..8925bb3a8322e88efd05fe935e107144ae39057b 100644

--- a/chrome/browser/notifications/desktop_notifications_unittest.cc

+++ b/chrome/browser/notifications/desktop_notifications_unittest.cc

@@ -103,7 +103,7 @@ void DesktopNotificationsTest::SetUp() {

active_desktop_monitor_.reset(new ActiveDesktopMonitor);

#endif

- chrome::RegisterLocalState(&local_state_);

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

profile_.reset(new TestingProfile());

ui_manager_.reset(new BalloonNotificationUIManager(&local_state_));

balloon_collection_ = new MockBalloonCollection();