chrome/browser/chromeos/proxy_config_service_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/chromeos/proxy_config_service_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: 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/chromeos/proxy_config_service_impl.cc ('k') | chrome/browser/chromeos/settings/device_settings_cache.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: chrome/browser/chromeos/proxy_config_service_impl_unittest.cc

diff --git a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc

index 85f440f62e891f1d51a69c977da32128d5af55fe..23a1aa1ecd65f44eb92b2037fe25988d47e1ef1c 100644

--- a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc

+++ b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc

@@ -235,11 +235,11 @@ class ProxyConfigServiceImplTestBase : public TESTBASE {

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

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

- virtual void Init(PrefServiceSimple* pref_service) {

+ virtual void Init(TestingPrefServiceSimple* pref_service) {

ASSERT_TRUE(pref_service);

DBusThreadManager::Initialize();

- PrefProxyConfigTrackerImpl::RegisterPrefs(pref_service);

- ProxyConfigServiceImpl::RegisterPrefs(pref_service);

+ PrefProxyConfigTrackerImpl::RegisterPrefs(pref_service->registry());

+ ProxyConfigServiceImpl::RegisterPrefs(pref_service->registry());

proxy_config_service_.reset(new ChromeProxyConfigService(NULL));

config_service_impl_.reset(new ProxyConfigServiceImpl(pref_service));

config_service_impl_->SetChromeProxyConfigService(

« no previous file with comments | « chrome/browser/chromeos/proxy_config_service_impl.cc ('k') | chrome/browser/chromeos/settings/device_settings_cache.h » ('j') | no next file with comments »