Move user cloud policy to BrowserProcess.

chrome/browser/policy/browser_policy_connector.h

 // Copyright (c) 2011 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/task.h"
 #include "chrome/browser/policy/enterprise_install_attributes.h"
 
 class PrefService;
 class TestingBrowserProcess;
 class TokenService;
 
 namespace net {
 class URLRequestContextGetter;
 }
 
 namespace policy {
 
+class CloudPolicyProvider;
 class CloudPolicySubsystem;
 class ConfigurationPolicyProvider;
 class DevicePolicyIdentityStrategy;
 
 // Manages the lifecycle of browser-global policy infrastructure, such as the
 // platform policy providers.
 class BrowserPolicyConnector {
  public:
   static BrowserPolicyConnector* Create();
   ~BrowserPolicyConnector();
 
   ConfigurationPolicyProvider* GetManagedPlatformProvider() const;
-  ConfigurationPolicyProvider* GetManagedCloudProvider() const;
+  CloudPolicyProvider* GetManagedCloudProvider() const;

[Mattias Nissler (ping if slow), 2011/05/31 14:14:19]

You shouldn't need to now that these are CloudPolicyProviders. I know that
currently you rely on this since the user policy stuff goes through this
accessor to get to the device policy maps. But that seems wrong too... Can't we
just give the user policy providers access directly to the
BrowserPolicyConnector's cache?

[sfeuz, 2011/06/03 08:30:35]

Obsolete.

   ConfigurationPolicyProvider* GetRecommendedPlatformProvider() const;
-  ConfigurationPolicyProvider* GetRecommendedCloudProvider() const;
+  CloudPolicyProvider* GetRecommendedCloudProvider() const;
 
   // Returns a weak pointer to the CloudPolicySubsystem managed by this
   // policy connector, or NULL if no such subsystem exists (i.e. when running
   // outside ChromeOS).
   CloudPolicySubsystem* cloud_policy_subsystem() {
     return cloud_policy_subsystem_.get();
   }
 
   // Used to set the credentials stored in the identity strategy associated
   // with this policy connector.
@@ skipping 28 matching lines @@
 
   // Constructor for tests that allows tests to use fake platform policy
   // providers instead of using the actual ones.
   BrowserPolicyConnector(
       ConfigurationPolicyProvider* managed_platform_provider,
       ConfigurationPolicyProvider* recommended_platform_provider);
 
   // Activates the cloud policy subsystem.
   void Initialize();
 
+  scoped_ptr<CloudPolicyProvider> managed_cloud_provider_;
+  scoped_ptr<CloudPolicyProvider> recommended_cloud_provider_;

[Joao da Silva, 2011/05/31 14:50:23]

These are only used on ChromeOS, so how about wrapping with

#if defined(OS_CHROMEOS)?

The implementations of Get*CloudProvider() should then also test for
OS_CHROMEOS, and just return NULL on other platforms. Similar to the
implementation of GetEnterpriseDomain().

[sfeuz, 2011/06/03 08:30:35]

Obsolete.
But I tried to put everything else which is device-only behind the guards.

+
   scoped_ptr<ConfigurationPolicyProvider> managed_platform_provider_;
   scoped_ptr<ConfigurationPolicyProvider> recommended_platform_provider_;
 
 #if defined(OS_CHROMEOS)
   scoped_ptr<DevicePolicyIdentityStrategy> identity_strategy_;
   scoped_ptr<EnterpriseInstallAttributes> install_attributes_;
 #endif
   scoped_ptr<CloudPolicySubsystem> cloud_policy_subsystem_;
 
   ScopedRunnableMethodFactory<BrowserPolicyConnector> method_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserPolicyConnector);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_BROWSER_POLICY_CONNECTOR_H_