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

Unified Diff: chrome/test/testing_pref_service.cc

Issue 6312121: Add initial device policy infrastructure. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: fix race condition and tests. Created 9 years, 11 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.h ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/test/testing_pref_service.cc
diff --git a/chrome/test/testing_pref_service.cc b/chrome/test/testing_pref_service.cc
index afcb1c57b0a4629bb36e07ca42c39aadf7b3274d..043dae458012cc70d54ca8dbca4f8ee2b07375cd 100644
--- a/chrome/test/testing_pref_service.cc
+++ b/chrome/test/testing_pref_service.cc
@@ -13,17 +13,16 @@
TestingPrefServiceBase::TestingPrefServiceBase(
TestingPrefStore* managed_platform_prefs,
- TestingPrefStore* device_management_prefs,
TestingPrefStore* user_prefs)
: PrefService(managed_platform_prefs,
- device_management_prefs,
+ NULL,
NULL,
NULL,
user_prefs,
NULL,
+ NULL,
new DefaultPrefStore()),
managed_platform_prefs_(managed_platform_prefs),
- device_management_prefs_(device_management_prefs),
user_prefs_(user_prefs) {
}
@@ -73,7 +72,6 @@ void TestingPrefServiceBase::RemovePref(TestingPrefStore* pref_store,
TestingPrefService::TestingPrefService()
: TestingPrefServiceBase(new TestingPrefStore(),
- new TestingPrefStore(),
new TestingPrefStore()) {
}
« no previous file with comments | « chrome/test/testing_pref_service.h ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698