chrome/browser/extensions/component_loader_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/extensions/component_loader_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/extensions/component_loader_unittest.cc

diff --git a/chrome/browser/extensions/component_loader_unittest.cc b/chrome/browser/extensions/component_loader_unittest.cc

index 87a00ba4d40d3a024b225542a765318490f99269..9c1b3e59795019cb1f13c2c40813c2246dfec193 100644

--- a/chrome/browser/extensions/component_loader_unittest.cc

+++ b/chrome/browser/extensions/component_loader_unittest.cc

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

#include "base/file_util.h"

#include "base/path_service.h"

#include "chrome/browser/extensions/test_extension_service.h"

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

#include "chrome/common/chrome_paths.h"

#include "chrome/common/extensions/extension.h"

#include "chrome/common/extensions/extension_set.h"

@@ -100,7 +101,8 @@ class ComponentLoaderTest : public testing::Test {

// Register the local state prefs.

#if defined(OS_CHROMEOS)

- local_state_.RegisterBooleanPref(prefs::kSpokenFeedbackEnabled, false);

+ local_state_.registry()->RegisterBooleanPref(

+ prefs::kSpokenFeedbackEnabled, false);

#endif

}

« no previous file with comments | « chrome/browser/extensions/app_launcher.cc ('k') | chrome/browser/external_protocol/external_protocol_handler.h » ('j') | no next file with comments »