Added ConfigurationPolicyProvider::RefreshPolicies.

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>
 
@@ skipping 22 matching lines @@
 // TODO(gfeher,mnissler): Factor out device and user specific methods into their
 // respective classes.
 class BrowserPolicyConnector : public content::NotificationObserver {
  public:
   // Indicates the type of token passed to SetDeviceCredentials.
   enum TokenType {
     TOKEN_TYPE_GAIA,  // A gaia service token.
     TOKEN_TYPE_OAUTH, // An OAuth v2 access token.
   };
 
-  static BrowserPolicyConnector* Create();
+  // 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();
+
   ConfigurationPolicyProvider* GetManagedPlatformProvider() const;
   ConfigurationPolicyProvider* GetManagedCloudProvider() const;
   ConfigurationPolicyProvider* GetRecommendedPlatformProvider() const;
   ConfigurationPolicyProvider* GetRecommendedCloudProvider() const;
 
   // 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)
@@ skipping 23 matching lines @@
   // Locks the device to an enterprise domain.
   EnterpriseInstallAttributes::LockResult LockDevice(const std::string& user);
 
   // Returns the enterprise domain if device is managed.
   std::string GetEnterpriseDomain();
 
   // Reset the device policy machinery. This stops any automatic retry behavior
   // and clears the error flags, so potential retries have a chance to succeed.
   void ResetDevicePolicy();
 
-  // Initiates a policy fetch after a successful device registration.
-  void FetchDevicePolicy();
+  // Initiates device and user policy fetches, if possible. Pending fetches
+  // will be cancelled.
+  void FetchCloudPolicy();
 
-  // Initiates a user policy fetch after a successful device registration. This
-  // is only safe to call when a user device token is available.
-  void FetchUserPolicy();
+  // Refreshes policies on each existing provider.
+  void RefreshPolicies();
 
   // Schedules initialization of the cloud policy backend services, if the
   // services are already constructed.
   void ScheduleServiceInitialization(int64 delay_milliseconds);
 
   // Initializes the user cloud policy infrastructure.
   // If |wait_for_policy_fetch| is true, the user policy will only become fully
   // initialized after a policy fetch is attempted. Note that Profile creation
   // is blocked until this initialization is complete.
   void InitializeUserPolicy(const std::string& user_name,
@@ skipping 12 matching lines @@
   const CloudPolicyDataStore* GetUserCloudPolicyDataStore() const;
 
   const ConfigurationPolicyHandlerList* GetHandlerList() const;
 
   // Works out the user affiliation by checking the given |user_name| against
   // the installation attributes.
   policy::CloudPolicyDataStore::UserAffiliation GetUserAffiliation(
       const std::string& user_name);
 
  private:
-  friend class ::TestingBrowserProcess;
-
-  BrowserPolicyConnector();
-
-  // Constructor for tests that allows tests to use fake platform and cloud
-  // policy providers instead of using the actual ones.
-  BrowserPolicyConnector(
-      ConfigurationPolicyProvider* managed_platform_provider,
-      ConfigurationPolicyProvider* recommended_platform_provider,
-      CloudPolicyProvider* managed_cloud_provider,
-      CloudPolicyProvider* recommended_cloud_provider);
-
   // content::NotificationObserver method overrides:
   virtual void Observe(int type,
                        const content::NotificationSource& source,
                        const content::NotificationDetails& details) OVERRIDE;
 
   // Initializes the device cloud policy infrasturcture.
   void InitializeDevicePolicy();
 
   // Activates the device cloud policy subsystem. This will be posted as a task
   // from InitializeDevicePolicy since it needs to wait for the message loops to
   // be running.
   void InitializeDevicePolicySubsystem();
 
-  static BrowserPolicyConnector* CreateForTests();
   static ConfigurationPolicyProvider* CreateManagedPlatformProvider();
   static ConfigurationPolicyProvider* CreateRecommendedPlatformProvider();
 
   scoped_ptr<ConfigurationPolicyProvider> managed_platform_provider_;
   scoped_ptr<ConfigurationPolicyProvider> recommended_platform_provider_;
 
   scoped_ptr<CloudPolicyProvider> managed_cloud_provider_;
   scoped_ptr<CloudPolicyProvider> recommended_cloud_provider_;
 
 #if defined(OS_CHROMEOS)
@@ skipping 21 matching lines @@
 
   // Used to convert policies to preferences.
   ConfigurationPolicyHandlerList handler_list_;
 
   DISALLOW_COPY_AND_ASSIGN(BrowserPolicyConnector);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_BROWSER_POLICY_CONNECTOR_H_