chrome/browser/ui/tab_contents/tab_contents_iterator_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/ui/tab_contents/tab_contents_iterator_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/ui/search_engines/keyword_editor_controller.cc ('k') | chrome/browser/ui/tabs/tab_strip_layout_type_prefs.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc

diff --git a/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc b/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc

index 9f300bc41e6e2d679fce0f71cefc5691a347b3d0..c92f12ddf5e8f39b2a9109b6fbfdd33c0d1f1235 100644

--- a/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc

+++ b/chrome/browser/ui/tab_contents/tab_contents_iterator_unittest.cc

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

#include "chrome/browser/browser_process.h"

#include "chrome/browser/browser_shutdown.h"

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

#include "chrome/browser/profiles/profile_manager.h"

#include "chrome/browser/ui/browser_commands.h"

#include "chrome/browser/ui/browser_list_impl.h"

@@ -181,9 +182,11 @@ TEST_F(BrowserListTest, TabContentsIteratorVerifyBrowser) {

TEST_F(BrowserListTest, MAYBE_AttemptRestart) {

ASSERT_TRUE(g_browser_process);

TestingPrefServiceSimple testing_pref_service;

- testing_pref_service.RegisterBooleanPref(prefs::kWasRestarted, false);

- testing_pref_service.RegisterBooleanPref(prefs::kRestartLastSessionOnShutdown,

- false);

+ testing_pref_service.registry()->RegisterBooleanPref(

+ prefs::kWasRestarted, false);

+ testing_pref_service.registry()->RegisterBooleanPref(

+ prefs::kRestartLastSessionOnShutdown,

+ false);

TestingBrowserProcess* testing_browser_process =

TestingBrowserProcess::GetGlobal();