Refactor: Inject StatisticsProvider as a dependency of DeviceCloudPolicyInitializer.

components/policy/core/common/cloud/cloud_policy_client.h

 // Copyright (c) 2012 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 COMPONENTS_POLICY_CORE_COMMON_CLOUD_CLOUD_POLICY_CLIENT_H_
 #define COMPONENTS_POLICY_CORE_COMMON_CLOUD_CLOUD_POLICY_CLIENT_H_
 
 #include <stdint.h>
 
 #include <map>
@@ skipping 185 matching lines @@
   // |callback| will be called when the operation completes.
   virtual void UpdateGcmId(const std::string& gcm_id,
                            const StatusCallback& callback);
 
   // Adds an observer to be called back upon policy and state changes.
   void AddObserver(Observer* observer);
 
   // Removes the specified observer.
   void RemoveObserver(Observer* observer);
 
+  const std::string& machine_id() const { return machine_id_; }
+  const std::string& machine_model() const { return machine_model_; }
+
   void set_submit_machine_id(bool submit_machine_id) {
     submit_machine_id_ = submit_machine_id;
   }
 
   void set_last_policy_timestamp(const base::Time& timestamp) {
     last_policy_timestamp_ = timestamp;
   }
 
   void set_public_key_version(int public_key_version) {
     public_key_version_ = public_key_version;
@@ skipping 158 matching lines @@
   // Data necessary for constructing policy requests.
   const std::string machine_id_;
   const std::string machine_model_;
   const std::string verification_key_hash_;
   PolicyTypeSet types_to_fetch_;
   std::vector<std::string> state_keys_to_upload_;
 
   std::string dm_token_;
   DeviceMode device_mode_ = DEVICE_MODE_NOT_SET;
   std::string client_id_;
-  bool submit_machine_id_ = false;
   base::Time last_policy_timestamp_;
   int public_key_version_ = -1;
   bool public_key_version_valid_ = false;
   std::string robot_api_auth_code_;
 
+  // Whether to send |machine_id_| as part of policy fetch.
+  bool submit_machine_id_ = false;
+
   // Information for the latest policy invalidation received.
   int64_t invalidation_version_ = 0;
   std::string invalidation_payload_;
 
   // The invalidation version used for the most recent fetch operation.
   int64_t fetched_invalidation_version_ = 0;
 
   // Used for issuing requests to the cloud.
   DeviceManagementService* service_ = nullptr;
 
@@ skipping 20 matching lines @@
 
   // Used to create tasks which run delayed on the UI thread.
   base::WeakPtrFactory<CloudPolicyClient> weak_ptr_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(CloudPolicyClient);
 };
 
 }  // namespace policy
 
 #endif  // COMPONENTS_POLICY_CORE_COMMON_CLOUD_CLOUD_POLICY_CLIENT_H_