New policy protobuf protocol.

chrome/browser/policy/device_management_policy_provider.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_DEVICE_MANAGEMENT_POLICY_PROVIDER_H_
 #define CHROME_BROWSER_POLICY_DEVICE_MANAGEMENT_POLICY_PROVIDER_H_
 #pragma once
 
 #include <string>
 
 #include "base/file_path.h"
 #include "base/observer_list.h"
 #include "base/scoped_ptr.h"
 #include "base/time.h"
 #include "chrome/browser/policy/configuration_policy_provider.h"
 #include "chrome/browser/policy/device_management_backend.h"
 #include "chrome/browser/policy/device_token_fetcher.h"
 
 class Profile;
 class TokenService;
 
 namespace policy {
 
+class CloudPolicyCache;
 class DeviceManagementBackend;
 class DeviceManagementPolicyCache;
 
 // Provides policy fetched from the device management server. With the exception
 // of the Provide method, which can be called on the FILE thread, all public
 // methods must be called on the UI thread.
 class DeviceManagementPolicyProvider
     :  public ConfigurationPolicyProvider,
        public DeviceManagementBackend::DevicePolicyResponseDelegate,
        public DeviceTokenFetcher::Observer {
  public:
   DeviceManagementPolicyProvider(const PolicyDefinitionList* policy_list,
                                  DeviceManagementBackend* backend,
-                                 Profile* profile);
+                                 Profile* profile,
+                                 bool cloud_policy_enabled);

[Mattias Nissler (ping if slow), 2011/02/02 12:27:55]

Is this the way to go? I think we should switch our client to first ask for
policy using the new request and if the server complains, fall back to the old
one.

[Jakob Kummerow, 2011/02/03 14:36:52]

Done.

 
   virtual ~DeviceManagementPolicyProvider();
 
   // ConfigurationPolicyProvider implementation:
   virtual bool Provide(ConfigurationPolicyStoreInterface* store);
   virtual bool IsInitializationComplete() const;
 
   // DevicePolicyResponseDelegate implementation:
   virtual void HandlePolicyResponse(
-      const em::DevicePolicyResponse& response);
+      const em::DevicePolicyResponse& response);  // deprecated.
+  virtual void HandleCloudPolicyResponse(
+      const em::CloudPolicyResponse& response);
   virtual void OnError(DeviceManagementBackend::ErrorCode code);
 
   // DeviceTokenFetcher::Observer implementation:
   virtual void OnTokenSuccess();
   virtual void OnTokenError();
   virtual void OnNotManaged();
 
   // Sets the refresh rate at which to re-fetch policy information.
   void SetRefreshRate(int64 refresh_rate_milliseconds);
 
@@ skipping 17 matching lines @@
   };
 
   class RefreshTask;
 
   friend class DeviceManagementPolicyProviderTest;
 
   // More configurable constructor for use by test cases.
   DeviceManagementPolicyProvider(const PolicyDefinitionList* policy_list,
                                  DeviceManagementBackend* backend,
                                  Profile* profile,
+                                 bool cloud_policy_enabled,
                                  int64 policy_refresh_rate_ms,
                                  int policy_refresh_deviation_factor_percent,
                                  int64 policy_refresh_deviation_max_ms,
                                  int64 policy_refresh_error_delay_ms,
                                  int64 token_fetch_error_delay_ms,
                                  int64 unmanaged_device_refresh_rate_ms);
 
   // Called by constructors to perform shared initialization. Initialization
   // requiring the IOThread must not be performed directly in this method,
   // rather must be deferred until the IOThread is fully initialized. This is
   // the case in InitializeAfterIOThreadExists.
   void Initialize(DeviceManagementBackend* backend,
                   Profile* profile,
+                  bool cloud_policy_enabled,
                   int64 policy_refresh_rate_ms,
                   int policy_refresh_deviation_factor_percent,
                   int64 policy_refresh_deviation_max_ms,
                   int64 policy_refresh_error_delay_ms,
                   int64 token_fetch_error_delay_ms,
                   int64 unmanaged_device_refresh_rate_ms);
 
   // ConfigurationPolicyProvider overrides:
   virtual void AddObserver(ConfigurationPolicyProvider::Observer* observer);
   virtual void RemoveObserver(ConfigurationPolicyProvider::Observer* observer);
@@ skipping 31 matching lines @@
   // backend.
   static std::string GetDeviceManagementURL();
 
   // Returns the path to the sub-directory in the user data directory
   // in which device management persistent state is stored.
   static FilePath GetOrCreateDeviceManagementDir(
       const FilePath& user_data_dir);
 
   scoped_ptr<DeviceManagementBackend> backend_;
   Profile* profile_;  // weak
-  scoped_ptr<DeviceManagementPolicyCache> cache_;
+  scoped_ptr<DeviceManagementPolicyCache> cache_;  // deprecated
+  scoped_ptr<CloudPolicyCache> cache2_;

[gfeher, 2011/02/02 08:42:45]

I suggest calling this cache_ and naming the previous as deprecated_cache_,
dm_cache_ or etc.

[Mattias Nissler (ping if slow), 2011/02/02 12:27:55]

I'm also not too sure about this. Thing is that the unmanaged bit we should be
able to migrate from the old cache file. So can't we just have a single cache
object here, add a new field in the cache protobuf, support caching both types
of policy for a while and eventually remove support for the old thing?

[Jakob Kummerow, 2011/02/03 14:36:52]

Done.

+  bool cloud_policy_enabled_;
   scoped_refptr<DeviceTokenFetcher> token_fetcher_;
   DeviceTokenFetcher::ObserverRegistrar registrar_;
   ObserverList<ConfigurationPolicyProvider::Observer, true> observer_list_;
   FilePath storage_dir_;
   ProviderState state_;
   bool initial_fetch_done_;
   RefreshTask* refresh_task_;
   int64 policy_refresh_rate_ms_;
   int policy_refresh_deviation_factor_percent_;
   int64 policy_refresh_deviation_max_ms_;
   int64 policy_refresh_error_delay_ms_;
   int64 effective_policy_refresh_error_delay_ms_;
   int64 token_fetch_error_delay_ms_;
   int64 effective_token_fetch_error_delay_ms_;
   int64 unmanaged_device_refresh_rate_ms_;
 
   DISALLOW_COPY_AND_ASSIGN(DeviceManagementPolicyProvider);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_DEVICE_MANAGEMENT_POLICY_PROVIDER_H_