Consolidate data storage and notifications in the cloud policy subsystem

chrome/browser/policy/cloud_policy_controller.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_CLOUD_POLICY_CONTROLLER_H_
 #define CHROME_BROWSER_POLICY_CLOUD_POLICY_CONTROLLER_H_
 #pragma once
 
 #include <string>
 
 #include "base/file_path.h"

[Joao da Silva, 2011/07/06 16:45:14]

Nit: file_path.h not used

[gfeher, 2011/07/07 13:51:00]

Done.

 #include "base/memory/scoped_ptr.h"
 #include "base/observer_list.h"
 #include "base/task.h"

[Joao da Silva, 2011/07/06 16:45:14]

Nit: task.h and observer_list.h not used

[gfeher, 2011/07/07 13:51:00]

Done.

 #include "base/time.h"

[Joao da Silva, 2011/07/06 16:45:14]

Nit: time.h only needed on .cc file

[gfeher, 2011/07/07 13:51:00]

Done.

[Joao da Silva, 2011/07/07 16:54:16]

Hmm it seems it's still in the .h, is it required there?

[gfeher, 2011/07/08 09:19:14]

Sorry. Done.

-#include "chrome/browser/policy/cloud_policy_identity_strategy.h"
+#include "chrome/browser/policy/cloud_policy_data.h"
 #include "chrome/browser/policy/configuration_policy_provider.h"
 #include "chrome/browser/policy/delayed_work_scheduler.h"
 #include "chrome/browser/policy/device_management_backend.h"
 #include "chrome/browser/policy/device_token_fetcher.h"
 
 class Profile;
 class TokenService;

[Joao da Silva, 2011/07/06 16:45:14]

Nit: Profile and TokenService not used

[gfeher, 2011/07/07 13:51:00]

Done.

 
 namespace policy {
 
+class CloudPolicyData;

[pastarmovj, 2011/07/06 12:11:57]

Why do you both include the header and forward declare it here. Please pick one
:)
P.S. I think you'll rather need the include given that this is a base class of
CPC.

[gfeher, 2011/07/06 15:14:20]

Done.

 class CloudPolicyCacheBase;
 class DeviceManagementBackend;

[pastarmovj, 2011/07/06 12:11:57]

Ditto. Pick one.

[gfeher, 2011/07/06 15:14:20]

Done.

 
 // Coordinates the actions of DeviceTokenFetcher, CloudPolicyIdentityStrategy,
 // DeviceManagementBackend, and CloudPolicyCache: calls their methods and
 // listens to their callbacks/notifications.
 class CloudPolicyController
     : public DeviceManagementBackend::DevicePolicyResponseDelegate,
-      public DeviceTokenFetcher::Observer,
-      public CloudPolicyIdentityStrategy::Observer {
+      public CloudPolicyData::Observer {
  public:
   // All parameters are weak pointers.
   CloudPolicyController(DeviceManagementService* service,
                         CloudPolicyCacheBase* cache,
                         DeviceTokenFetcher* token_fetcher,
-                        CloudPolicyIdentityStrategy* identity_strategy,
+                        CloudPolicyData* data,
                         PolicyNotifier* notifier);
   virtual ~CloudPolicyController();
 
   // Sets the refresh rate at which to re-fetch policy information.
   void SetRefreshRate(int64 refresh_rate_milliseconds);
 
   // Triggers an immediate retry of of the current operation.
   void Retry();
 
   // Stops all auto-retrying error handling behavior inside the policy
   // subsystem.
   void StopAutoRetry();
 
   // DevicePolicyResponseDelegate implementation:
   virtual void HandlePolicyResponse(
       const em::DevicePolicyResponse& response);
   virtual void OnError(DeviceManagementBackend::ErrorCode code);

[Joao da Silva, 2011/07/06 16:45:14]

Nit: OVERRIDE on these 2 methods

[gfeher, 2011/07/07 13:51:00]

Done.

 
-  // DeviceTokenFetcher::Observer implementation:
-  virtual void OnDeviceTokenAvailable();
-
-  // CloudPolicyIdentityStrategy::Observer implementation:
+  // CloudPolicyData::Observer implementation:
   virtual void OnDeviceTokenChanged();
   virtual void OnCredentialsChanged();
+  virtual void OnPolicyDataGoingAway();

[Joao da Silva, 2011/07/06 16:45:14]

Nit: OVERRIDE on these 3 methods

[gfeher, 2011/07/07 13:51:00]

Done.

 
  private:
   // Indicates the current state the controller is in.
   enum ControllerState {
     // The controller is initializing, policy information not yet available.
     STATE_TOKEN_UNAVAILABLE,
     // The device is not managed. Should retry fetching the token after delay.
     STATE_TOKEN_UNMANAGED,
     // The token is not valid and should be refetched with exponential back-off.
     STATE_TOKEN_ERROR,
     // The token is valid, but policy is yet to be fetched.
     STATE_TOKEN_VALID,
     // Policy information is available and valid.
     STATE_POLICY_VALID,
     // The service returned an error when requesting policy, will retry.
     STATE_POLICY_ERROR,
     // The service returned an error that is not going to go away soon.
     STATE_POLICY_UNAVAILABLE
   };
 
   friend class CloudPolicyControllerTest;
   friend class TestingCloudPolicySubsystem;
 
   // More configurable constructor for use by test cases.
   // Takes ownership of |scheduler|; the other parameters are weak pointers.
   CloudPolicyController(DeviceManagementService* service,
                         CloudPolicyCacheBase* cache,
                         DeviceTokenFetcher* token_fetcher,
-                        CloudPolicyIdentityStrategy* identity_strategy,
+                        CloudPolicyData* data,
                         PolicyNotifier* notifier,
                         DelayedWorkScheduler* scheduler);
 
   // Called by constructors to perform shared initialization.
   void Initialize(DeviceManagementService* service,
                   CloudPolicyCacheBase* cache,
                   DeviceTokenFetcher* token_fetcher,
-                  CloudPolicyIdentityStrategy* identity_strategy,
+                  CloudPolicyData* data,
                   PolicyNotifier* notifier,
                   DelayedWorkScheduler* scheduler);
 
   // Asks the token fetcher to fetch a new token.
   void FetchToken();
 
   // Sends a request to the device management backend to fetch policy if one
   // isn't already outstanding.
   void SendPolicyRequest();
 
   // Called back from |scheduler_|.
   // Performs whatever action is required in the current state,
   // e.g. refreshing policy.
   void DoWork();
 
   // Switches to a new state and triggers any appropriate actions.
   void SetState(ControllerState new_state);
 
   // Computes the policy refresh delay to use.
   int64 GetRefreshDelay();
 
   DeviceManagementService* service_;
   CloudPolicyCacheBase* cache_;
-  CloudPolicyIdentityStrategy* identity_strategy_;
+  CloudPolicyData* data_;
   DeviceTokenFetcher* token_fetcher_;
   scoped_ptr<DeviceManagementBackend> backend_;
   ControllerState state_;
   PolicyNotifier* notifier_;
 
   int64 policy_refresh_rate_ms_;
   int64 effective_policy_refresh_error_delay_ms_;
 
   scoped_ptr<DelayedWorkScheduler> scheduler_;
 
   DISALLOW_COPY_AND_ASSIGN(CloudPolicyController);
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_CLOUD_POLICY_CONTROLLER_H_