Enable user policy handling through the new cloud policy stack.

chrome/browser/policy/browser_policy_connector.h

Index: chrome/browser/policy/browser_policy_connector.h
diff --git a/chrome/browser/policy/browser_policy_connector.h b/chrome/browser/policy/browser_policy_connector.h
index 2c524726c0908dc744d7ffb3e83ace6d9c9ee3ec..c266d1039e01cadd124b345384740713032be00b 100644
--- a/chrome/browser/policy/browser_policy_connector.h
+++ b/chrome/browser/policy/browser_policy_connector.h
@@ -14,6 +14,7 @@
 #include "chrome/browser/policy/cloud_policy_constants.h"
 #include "chrome/browser/policy/configuration_policy_handler_list.h"
 #include "chrome/browser/policy/enterprise_install_attributes.h"
+#include "chrome/browser/policy/proxy_policy_provider.h"
 #include "content/public/browser/notification_observer.h"
 #include "content/public/browser/notification_registrar.h"
 
@@ -27,7 +28,10 @@ class CloudPolicyDataStore;
 class CloudPolicyProvider;
 class CloudPolicySubsystem;
 class ConfigurationPolicyProvider;
+class DeviceManagementService;
 class PolicyService;
+class ProxyPolicyProvider;

[Joao da Silva, 2012/06/05 07:21:46]

Nit: header is included

[Mattias Nissler (ping if slow), 2012/06/05 10:27:21]

Done.

+class UserCloudPolicyManager;
 class UserPolicyTokenCache;
 
 // Manages the lifecycle of browser-global policy infrastructure, such as the
@@ -48,7 +52,7 @@ class BrowserPolicyConnector : public content::NotificationObserver {
 
   // Creates a new policy service for the given profile, or a global one if
   // it is NULL. Ownership is transferred to the caller.
-  PolicyService* CreatePolicyService(Profile* profile) const;
+  PolicyService* CreatePolicyService(Profile* profile);
 
   // Returns a weak pointer to the CloudPolicySubsystem corresponding to the
   // device policy managed by this policy connector, or NULL if no such
@@ -169,6 +173,14 @@ class BrowserPolicyConnector : public content::NotificationObserver {
   scoped_ptr<CloudPolicyDataStore> user_data_store_;
   scoped_ptr<CloudPolicySubsystem> user_cloud_policy_subsystem_;
 
+  // Components of the new-style cloud policy implementation.
+  // TODO(mnissler): Remove the old-style components above once we have
+  // completed the switch to the new cloud policy implementation.
+  scoped_ptr<DeviceManagementService> device_management_service_;
+
+  ProxyPolicyProvider user_cloud_policy_provider_;

[Joao da Silva, 2012/06/05 07:21:46]

This will be deleted after the |handler_list_|, leading to the use-after-free
crashes we saw before.

I'd move |handler_list_| to the top, and make it the last thing to be destructed
since it doesn't have other dependencies. If you do that, then there's no need
for the explicit reset() of the providers in the dtor; and the comment there
should be next to |handler_list_| to explain why it's there.

[Mattias Nissler (ping if slow), 2012/06/05 10:27:21]

Done.

+  scoped_ptr<UserCloudPolicyManager> user_cloud_policy_manager_;
+
   // Used to initialize the device policy subsystem once the message loops
   // are spinning.
   base::WeakPtrFactory<BrowserPolicyConnector> weak_ptr_factory_;