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

Unified Diff: chrome/test/testing_profile.h

Issue 3051001: Adjust preference sync code to only sync user modifiable preferences. (Closed) Base URL: http://src.chromium.org/git/chromium.git
Patch Set: separate out the download_manager_unittest.cc fixes Created 10 years, 5 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/test/testing_pref_service.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/testing_profile.h
diff --git a/chrome/test/testing_profile.h b/chrome/test/testing_profile.h
index 8421570b297069e86218aa0e7594c5d3ed4b6cee..b23435e50c591475da087c048f838ed5d6160f82 100644
--- a/chrome/test/testing_profile.h
+++ b/chrome/test/testing_profile.h
@@ -27,6 +27,7 @@
#include "chrome/browser/search_engines/template_url_model.h"
#include "chrome/common/json_pref_store.h"
#include "chrome/common/net/url_request_context_getter.h"
+#include "chrome/test/testing_pref_service.h"
#include "net/base/cookie_monster.h"
class ProfileSyncService;
@@ -149,12 +150,9 @@ class TestingProfile : public Profile {
virtual PasswordStore* GetPasswordStore(ServiceAccessType access) {
return NULL;
}
- virtual PrefService* GetPrefs() {
+ virtual TestingPrefService* GetPrefs() {
if (!prefs_.get()) {
- FilePath prefs_filename =
- path_.Append(FILE_PATH_LITERAL("TestPreferences"));
-
- prefs_.reset(PrefService::CreateUserPrefService(prefs_filename));
+ prefs_.reset(new TestingPrefService());
Profile::RegisterUserPrefs(prefs_.get());
browser::RegisterAllPrefs(prefs_.get(), prefs_.get());
}
@@ -292,7 +290,7 @@ class TestingProfile : public Profile {
// to this.
FilePath path_;
base::Time start_time_;
- scoped_ptr<PrefService> prefs_;
+ scoped_ptr<TestingPrefService> prefs_;
private:
// Destroys favicon service if it has been created.
« no previous file with comments | « chrome/test/testing_pref_service.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698