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

Unified Diff: chrome/browser/profiles/off_the_record_profile_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
« no previous file with comments | « chrome/browser/profiles/off_the_record_profile_impl.cc ('k') | chrome/browser/profiles/profile.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/profiles/off_the_record_profile_impl_unittest.cc
diff --git a/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc b/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc
index b85292ac7f53a7dedf7caf5c8f6a99b3b1d919e3..7586981154928977c3286bbf5a995a91b199e0d1 100644
--- a/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc
+++ b/chrome/browser/profiles/off_the_record_profile_impl_unittest.cc
@@ -6,6 +6,7 @@
#include "chrome/browser/net/ssl_config_service_manager.h"
#include "chrome/browser/prefs/browser_prefs.h"
+#include "chrome/browser/prefs/pref_service.h"
#include "chrome/browser/prefs/scoped_user_pref_update.h"
#include "chrome/browser/profiles/profile_dependency_manager.h"
#include "chrome/common/pref_names.h"
@@ -39,7 +40,7 @@ class TestingProfileWithHostZoomMap : public TestingProfile,
return off_the_record_profile_.get();
}
- virtual PrefService* GetOffTheRecordPrefs() OVERRIDE {
+ virtual PrefServiceSyncable* GetOffTheRecordPrefs() OVERRIDE {
return GetPrefs();
}
@@ -84,7 +85,7 @@ class OffTheRecordProfileImplTest : public BrowserWithTestWindowTest {
virtual ~OffTheRecordProfileImplTest() {}
virtual void SetUp() OVERRIDE {
- prefs_.reset(new TestingPrefService);
+ prefs_.reset(new TestingPrefServiceSimple);
chrome::RegisterLocalState(prefs_.get());
browser_process()->SetLocalState(prefs_.get());
@@ -104,7 +105,7 @@ class OffTheRecordProfileImplTest : public BrowserWithTestWindowTest {
return static_cast<TestingBrowserProcess*>(g_browser_process);
}
- scoped_ptr<PrefService> prefs_;
+ scoped_ptr<PrefServiceSimple> prefs_;
DISALLOW_COPY_AND_ASSIGN(OffTheRecordProfileImplTest);
};
« no previous file with comments | « chrome/browser/profiles/off_the_record_profile_impl.cc ('k') | chrome/browser/profiles/profile.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698