Consolidate data storage and notifications in the cloud policy subsystem

chrome/browser/policy/device_token_fetcher.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_TOKEN_FETCHER_H_
 #define CHROME_BROWSER_POLICY_DEVICE_TOKEN_FETCHER_H_
 #pragma once
 
 #include <string>

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

Nit: string 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: observer_list.h and task.h not used

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

Done.

+#include "chrome/browser/policy/cloud_policy_data.h"

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

I think you might be able to only Fwd declare this one.

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

Done.

 #include "chrome/browser/policy/delayed_work_scheduler.h"
 #include "chrome/browser/policy/device_management_backend.h"
 #include "chrome/browser/policy/policy_notifier.h"
 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
 
 namespace policy {
 
 class CloudPolicyCacheBase;
 class DeviceManagementService;
 
 namespace em = enterprise_management;
 
 // Fetches the device token that can be used for policy requests with the device
 // management server, either from disk if it already has been successfully
 // requested, otherwise from the device management server. An instance of the
 // fetcher is shared as a singleton by all users of the device management token
 // to ensure they all get the same token.
 class DeviceTokenFetcher
     : public DeviceManagementBackend::DeviceRegisterResponseDelegate {
  public:
-  class Observer {
-   public:
-    virtual ~Observer() {}
-    virtual void OnDeviceTokenAvailable() = 0;
-  };
-
   // |service| is used to talk to the device management service and |cache| is
   // used to persist whether the device is unmanaged.
   DeviceTokenFetcher(DeviceManagementService* service,
                      CloudPolicyCacheBase* cache,
+                     CloudPolicyData* data,
                      PolicyNotifier* notifier);
   // Version for tests that allows to set timing parameters.
   // Takes ownership of |scheduler|.
   DeviceTokenFetcher(DeviceManagementService* service,
                      CloudPolicyCacheBase* cache,
+                     CloudPolicyData* data,
                      PolicyNotifier* notifier,
                      DelayedWorkScheduler* scheduler);
   virtual ~DeviceTokenFetcher();
 
   // Starts fetching a token.
   // Declared virtual so it can be overridden by mocks.
-  virtual void FetchToken(const std::string& auth_token,
-                          const std::string& device_id,
-                          em::DeviceRegisterRequest_Type policy_type,
-                          const std::string& machine_id,
-                          const std::string& machine_model);
+  virtual void FetchToken();
 
   virtual void SetUnmanagedState();
 
-  // Returns the device management token or the empty string if not available.
-  // Declared virtual so it can be overridden by mocks.
-  virtual const std::string& GetDeviceToken();
-
   // Disables the auto-retry-on-error behavior of this token fetcher.
   void StopAutoRetry();
 
-  void AddObserver(Observer* observer);
-  void RemoveObserver(Observer* observer);
-
   // DeviceManagementBackend::DeviceRegisterResponseDelegate method overrides:
   virtual void HandleRegisterResponse(
       const em::DeviceRegisterResponse& response);
   virtual void OnError(DeviceManagementBackend::ErrorCode code);

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

Nit: add OVERRIDE to these

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

Done.

 
  private:
   friend class DeviceTokenFetcherTest;
 
   // The different states that the fetcher can be in during the process of
   // getting the device token. |state_| is initialized to INACTIVE, depending
   // on the result of a token fetching attempt can transition to either of
   // TOKEN_AVAILABLE, UNMANAGED, or ERROR. The first attempt must be triggered
   // externally. When |state_| is UNMANAGED, a new fetching attempt is
   // performed every |unmanaged_device_refresh_rate_ms_|; when it's ERROR,
   // a new attempt is done after |effective_token_fetch_error_delay_ms_|.
   enum FetcherState {
     // Fetcher inactive.
     STATE_INACTIVE,
     // Token available.
     STATE_TOKEN_AVAILABLE,
     // Device unmanaged.
     STATE_UNMANAGED,
     // Error, retry later.
     STATE_ERROR,
     // Temporary error. Retry sooner.
     STATE_TEMPORARY_ERROR,
     // Server rejected the auth token.
     STATE_BAD_AUTH
   };
 
   // Common initialization helper.
   void Initialize(DeviceManagementService* service,
                   CloudPolicyCacheBase* cache,
+                  CloudPolicyData* data,
                   PolicyNotifier* notifier,
                   DelayedWorkScheduler* scheduler);
 
   // Moves the fetcher into a new state.
   void SetState(FetcherState state);
 
   // Resets |backend_|, then uses |auth_token_| and |device_id_| to perform
   // an actual token fetch.
   void FetchTokenInternal();
 
@@ skipping 12 matching lines @@
 
   // Refresh parameters.
   int64 token_fetch_error_delay_ms_;
   int64 token_fetch_error_max_delay_ms_;
   int64 effective_token_fetch_error_delay_ms_;
   int64 unmanaged_device_refresh_rate_ms_;
 
   // State the fetcher is currently in.
   FetcherState state_;
 
-  // Current device token.
-  std::string device_token_;
-
-  // Contains the AuthToken for the device management server.
-  std::string auth_token_;
-  // Device identifier to send to the server.
-  std::string device_id_;
-  // Contains policy type to send to the server.
-  em::DeviceRegisterRequest_Type policy_type_;
-  // Contains physical machine id to send to the server.
-  std::string machine_id_;
-  // Contains physical machine model to send to server.
-  std::string machine_model_;
+  CloudPolicyData* data_;
 
   scoped_ptr<DelayedWorkScheduler> scheduler_;
-
-  ObserverList<Observer, true> observer_list_;
 };
 
 }  // namespace policy
 
 #endif  // CHROME_BROWSER_POLICY_DEVICE_TOKEN_FETCHER_H_