Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(446)

Unified Diff: chrome/browser/chromeos/proxy_config_service_impl_unittest.cc

Issue 11570009: Split PrefService into PrefService, PrefServiceSimple and PrefServiceSyncable. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Merge to head again, previous had unrelated broken win_rel test. Created 8 years 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/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 e102e0462de6f82b4f9b6da8bdf15fecd32a9e06..9040c7719227234e6da9f8905b111cf118ca9365 100644
--- a/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc
+++ b/chrome/browser/chromeos/proxy_config_service_impl_unittest.cc
@@ -235,7 +235,7 @@ class ProxyConfigServiceImplTestBase : public TESTBASE {
: ui_thread_(BrowserThread::UI, &loop_),
io_thread_(BrowserThread::IO, &loop_) {}
- virtual void Init(PrefService* pref_service) {
+ virtual void Init(PrefServiceSimple* pref_service) {
ASSERT_TRUE(pref_service);
DBusThreadManager::Initialize();
PrefProxyConfigTrackerImpl::RegisterPrefs(pref_service);
@@ -340,7 +340,7 @@ class ProxyConfigServiceImplTest
Init(&pref_service_);
}
- TestingPrefService pref_service_;
+ TestingPrefServiceSimple pref_service_;
};
TEST_F(ProxyConfigServiceImplTest, NetworkProxy) {
« 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 »

Powered by Google App Engine
This is Rietveld 408576698