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

Unified Diff: chrome/browser/prefs/pref_service_mock_builder.h

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/browser/prefs/pref_service.cc ('k') | chrome/browser/prefs/pref_service_mock_builder.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: chrome/browser/prefs/pref_service_mock_builder.h
diff --git a/chrome/browser/prefs/pref_service_mock_builder.h b/chrome/browser/prefs/pref_service_mock_builder.h
index 0c4a6e89f3d2fffb62dec95a61af5736175d5954..3e4d1e04831ce9587bf21a5993e4fd005e7f4a69 100644
--- a/chrome/browser/prefs/pref_service_mock_builder.h
+++ b/chrome/browser/prefs/pref_service_mock_builder.h
@@ -29,18 +29,21 @@ class PrefServiceMockBuilder {
// Functions for setting the various parameters of the PrefService to build.
// These take ownership of the |store| parameter.
PrefServiceMockBuilder& WithManagedPlatformPrefs(PrefStore* store);
- PrefServiceMockBuilder& WithDeviceManagementPrefs(PrefStore* store);
+ PrefServiceMockBuilder& WithManagedCloudPrefs(PrefStore* store);
PrefServiceMockBuilder& WithExtensionPrefs(PrefStore* store);
PrefServiceMockBuilder& WithCommandLinePrefs(PrefStore* store);
PrefServiceMockBuilder& WithUserPrefs(PersistentPrefStore* store);
- PrefServiceMockBuilder& WithRecommendedPrefs(PrefStore* store);
+ PrefServiceMockBuilder& WithRecommendedPlatformPrefs(PrefStore* store);
+ PrefServiceMockBuilder& WithRecommendedCloudPrefs(PrefStore* store);
// Set up policy pref stores using the given policy provider.
PrefServiceMockBuilder& WithManagedPlatformProvider(
policy::ConfigurationPolicyProvider* provider);
- PrefServiceMockBuilder& WithDeviceManagementProvider(
+ PrefServiceMockBuilder& WithManagedCloudProvider(
policy::ConfigurationPolicyProvider* provider);
- PrefServiceMockBuilder& WithRecommendedProvider(
+ PrefServiceMockBuilder& WithRecommendedPlatformProvider(
+ policy::ConfigurationPolicyProvider* provider);
+ PrefServiceMockBuilder& WithRecommendedCloudProvider(
policy::ConfigurationPolicyProvider* provider);
// Specifies to use an actual command-line backed command-line pref store.
@@ -49,19 +52,17 @@ class PrefServiceMockBuilder {
// Specifies to use an actual file-backed user pref store.
PrefServiceMockBuilder& WithUserFilePrefs(const FilePath& prefs_file);
- // Sets the profile to pass to the PrefService.
- PrefServiceMockBuilder& WithRecommendedPrefs(Profile* profile);
-
// Creates the PrefService, invalidating the entire builder configuration.
PrefService* Create();
private:
scoped_refptr<PrefStore> managed_platform_prefs_;
- scoped_refptr<PrefStore> device_management_prefs_;
+ scoped_refptr<PrefStore> managed_cloud_prefs_;
scoped_refptr<PrefStore> extension_prefs_;
scoped_refptr<PrefStore> command_line_prefs_;
scoped_refptr<PersistentPrefStore> user_prefs_;
- scoped_refptr<PrefStore> recommended_prefs_;
+ scoped_refptr<PrefStore> recommended_platform_prefs_;
+ scoped_refptr<PrefStore> recommended_cloud_prefs_;
DISALLOW_COPY_AND_ASSIGN(PrefServiceMockBuilder);
};
« no previous file with comments | « chrome/browser/prefs/pref_service.cc ('k') | chrome/browser/prefs/pref_service_mock_builder.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698