Add initial device policy infrastructure.

chrome/browser/policy/configuration_policy_pref_store.cc

Index: chrome/browser/policy/configuration_policy_pref_store.cc
diff --git a/chrome/browser/policy/configuration_policy_pref_store.cc b/chrome/browser/policy/configuration_policy_pref_store.cc
index b79576edb6d59083a0df362a44ad2cb95c6d024c..97363b0714ab960533ff98b95c9b8bf3cc099842 100644
--- a/chrome/browser/policy/configuration_policy_pref_store.cc
+++ b/chrome/browser/policy/configuration_policy_pref_store.cc
@@ -18,9 +18,8 @@
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "chrome/browser/browser_process.h"
+#include "chrome/browser/policy/browser_policy_context.h"
 #include "chrome/browser/policy/configuration_policy_provider.h"
-#include "chrome/browser/policy/configuration_policy_provider_keeper.h"
-#include "chrome/browser/policy/device_management_policy_provider.h"
 #include "chrome/browser/policy/profile_policy_context.h"
 #include "chrome/browser/prefs/pref_value_map.h"
 #include "chrome/browser/prefs/proxy_prefs.h"
@@ -730,32 +729,45 @@ void ConfigurationPolicyPrefStore::OnProviderGoingAway() {
 // static
 ConfigurationPolicyPrefStore*
 ConfigurationPolicyPrefStore::CreateManagedPlatformPolicyPrefStore() {
-  ConfigurationPolicyProviderKeeper* keeper =
-      g_browser_process->configuration_policy_provider_keeper();
-  return new ConfigurationPolicyPrefStore(keeper->managed_platform_provider());
+  BrowserPolicyContext* context = g_browser_process->browser_policy_context();
+  return new ConfigurationPolicyPrefStore(
+                 context->GetManagedPlatformProvider());

[danno, 2011/02/04 16:01:33]

indentation

[Jakob Kummerow, 2011/02/14 13:50:34]

Done.

 }
 
 // static
 ConfigurationPolicyPrefStore*
 ConfigurationPolicyPrefStore::CreateManagedCloudPolicyPrefStore(
     Profile* profile) {
-  return new ConfigurationPolicyPrefStore(
-      profile->GetPolicyContext()->GetDeviceManagementPolicyProvider());
+  ConfigurationPolicyProvider* provider = NULL;
+  if (profile)
+    provider = profile->GetPolicyContext()->GetManagedPolicyProvider();
+  if (!provider) {
+    BrowserPolicyContext* context = g_browser_process->browser_policy_context();
+    provider = context->GetManagedCloudProvider();
+  }
+  return new ConfigurationPolicyPrefStore(provider);
 }
 
 // static
 ConfigurationPolicyPrefStore*
 ConfigurationPolicyPrefStore::CreateRecommendedPlatformPolicyPrefStore() {
-  ConfigurationPolicyProviderKeeper* keeper =
-      g_browser_process->configuration_policy_provider_keeper();
-  return new ConfigurationPolicyPrefStore(keeper->recommended_provider());
+  BrowserPolicyContext* context = g_browser_process->browser_policy_context();
+  return new ConfigurationPolicyPrefStore(
+                 context->GetRecommendedPlatformProvider());

[danno, 2011/02/04 16:01:33]

indentation

[Jakob Kummerow, 2011/02/14 13:50:34]

Done.

 }
 
 // static
 ConfigurationPolicyPrefStore*
 ConfigurationPolicyPrefStore::CreateRecommendedCloudPolicyPrefStore(
     Profile* profile) {
-  return new ConfigurationPolicyPrefStore(NULL);
+  ConfigurationPolicyProvider* provider = NULL;
+  if (profile)
+    provider = profile->GetPolicyContext()->GetRecommendedPolicyProvider();
+  if (!provider) {
+    BrowserPolicyContext* context = g_browser_process->browser_policy_context();
+    provider = context->GetRecommendedCloudProvider();
+  }
+  return new ConfigurationPolicyPrefStore(provider);
 }
 
 /* static */