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

Unified Diff: chrome/test/base/testing_browser_process.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/test/base/testing_browser_process.h ('k') | chrome/test/base/testing_pref_service.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/base/testing_browser_process.cc
diff --git a/chrome/test/base/testing_browser_process.cc b/chrome/test/base/testing_browser_process.cc
index fc0a3f7ba38efe97a42255407081e8732e132f4a..0054fc8adf9dd777a557d22da65fd68c057d4730 100644
--- a/chrome/test/base/testing_browser_process.cc
+++ b/chrome/test/base/testing_browser_process.cc
@@ -82,7 +82,7 @@ void TestingBrowserProcess::SetProfileManager(ProfileManager* profile_manager) {
#endif
}
-PrefService* TestingBrowserProcess::local_state() {
+PrefServiceSimple* TestingBrowserProcess::local_state() {
return local_state_;
}
@@ -318,7 +318,7 @@ void TestingBrowserProcess::SetSystemRequestContext(
system_request_context_ = context_getter;
}
-void TestingBrowserProcess::SetLocalState(PrefService* local_state) {
+void TestingBrowserProcess::SetLocalState(PrefServiceSimple* local_state) {
if (!local_state) {
// The local_state_ PrefService is owned outside of TestingBrowserProcess,
// but some of the members of TestingBrowserProcess hold references to it
« no previous file with comments | « chrome/test/base/testing_browser_process.h ('k') | chrome/test/base/testing_pref_service.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698