chrome/browser/net/pref_proxy_config_tracker_impl_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/net/pref_proxy_config_tracker_impl_unittest.cc

Issue 11741003: Remove PrefServiceSimple, replacing it with PrefService and PrefRegistrySimple. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src

Patch Set: Created 7 years, 12 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/pref_proxy_config_tracker_impl.cc ('k') | chrome/browser/net/ssl_config_service_manager.h » ('j') | chrome/browser/prefs/pref_registrar_simple.h » ('J')
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc

diff --git a/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc b/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc

index e14841cdf3fb5d90a1e77108eac785cd7e1992f9..c1e729937ee87fbb9def92cc39b8783da7464871 100644

--- a/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc

+++ b/chrome/browser/net/pref_proxy_config_tracker_impl_unittest.cc

@@ -77,9 +77,10 @@ class PrefProxyConfigTrackerImplTestBase : public TESTBASE {

: ui_thread_(BrowserThread::UI, &loop_),

io_thread_(BrowserThread::IO, &loop_) {}

- virtual void Init(PrefServiceSimple* pref_service) {

+ virtual void Init(PrefService* pref_service) {

ASSERT_TRUE(pref_service);

- PrefProxyConfigTrackerImpl::RegisterPrefs(pref_service);

+ PrefRegistrarSimple registrar(pref_service);

+ PrefProxyConfigTrackerImpl::RegisterPrefs(&registrar);

fixed_config_.set_pac_url(GURL(kFixedPacUrl));

delegate_service_ =

new TestProxyConfigService(fixed_config_,

@@ -346,7 +347,7 @@ class PrefProxyConfigTrackerImplCommandLineTest

private:

CommandLine command_line_;

- scoped_ptr<PrefServiceSimple> pref_service_;

+ scoped_ptr<PrefService> pref_service_;

};

TEST_P(PrefProxyConfigTrackerImplCommandLineTest, CommandLine) {