Enable user policy handling through the new cloud policy stack.

chrome/browser/policy/browser_policy_connector.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_POLICY_BROWSER_POLICY_CONNECTOR_H_
 #define CHROME_BROWSER_POLICY_BROWSER_POLICY_CONNECTOR_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #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"
 
 class Profile;
 class TokenService;
 
 namespace policy {
 
 class AppPackUpdater;
 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
 // platform policy providers, device- and the user-cloud policy infrastructure.
 // TODO(gfeher,mnissler): Factor out device and user specific methods into their
 // respective classes.
 class BrowserPolicyConnector : public content::NotificationObserver {
  public:
   // Builds an uninitialized BrowserPolicyConnector, suitable for testing.
   // Init() should be called to create and start the policy machinery.
   BrowserPolicyConnector();
   virtual ~BrowserPolicyConnector();
 
   // Creates the policy providers and finalizes the initialization of the
   // connector. This call can be skipped on tests that don't require the full
   // policy system running.
   void Init();
 
   // 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
   // subsystem exists (i.e. when running outside ChromeOS).
   CloudPolicySubsystem* device_cloud_policy_subsystem() {
 #if defined(OS_CHROMEOS)
     return device_cloud_policy_subsystem_.get();
 #else
     return NULL;
 #endif
@@ skipping 100 matching lines @@
 #if defined(OS_CHROMEOS)
   scoped_ptr<CloudPolicyDataStore> device_data_store_;
   scoped_ptr<CloudPolicySubsystem> device_cloud_policy_subsystem_;
   scoped_ptr<EnterpriseInstallAttributes> install_attributes_;
 #endif
 
   scoped_ptr<UserPolicyTokenCache> user_policy_token_cache_;
   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_;
 
   // Registers the provider for notification of successful Gaia logins.
   content::NotificationRegistrar registrar_;
 
   // Weak reference to the TokenService we are listening to for user cloud
   // policy authentication tokens.
   TokenService* token_service_;
 
   // Used to convert policies to preferences.
   ConfigurationPolicyHandlerList handler_list_;
 
 #if defined(OS_CHROMEOS)
   scoped_ptr<AppPackUpdater> app_pack_updater_;
 #endif
 
   DISALLOW_COPY_AND_ASSIGN(BrowserPolicyConnector);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_BROWSER_POLICY_CONNECTOR_H_