Add device status reports to policy requests.

chrome/browser/policy/cloud_policy_data_store.cc

 // 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.
 
 #include "chrome/browser/policy/cloud_policy_data_store.h"
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
+#include "chrome/browser/browser_process.h"
 #include "chrome/browser/policy/proto/device_management_backend.pb.h"
 #include "chrome/browser/policy/proto/device_management_constants.h"
 
 namespace policy {
 
 CloudPolicyDataStore::~CloudPolicyDataStore() {}
 
 // static
 CloudPolicyDataStore* CloudPolicyDataStore::CreateForUserPolicies() {
   return new CloudPolicyDataStore(em::DeviceRegisterRequest::USER,
                                   kChromeUserPolicyType);
 }
 
 // static
 CloudPolicyDataStore* CloudPolicyDataStore::CreateForDevicePolicies() {
   return new CloudPolicyDataStore(em::DeviceRegisterRequest::DEVICE,
                                   kChromeDevicePolicyType);
 }
 
 CloudPolicyDataStore::CloudPolicyDataStore(
     const em::DeviceRegisterRequest_Type policy_register_type,
     const std::string& policy_type)
     : user_affiliation_(USER_AFFILIATION_NONE),
       policy_register_type_(policy_register_type),
       policy_type_(policy_type),
-      token_cache_loaded_(false) {}
+      token_cache_loaded_(false),
+      device_status_reporter_(g_browser_process->local_state()) {}

[Mattias Nissler (ping if slow), 2011/11/25 14:15:19]

Please pass in the reference to local state so easier mocking in tests.

[Patrick Dubroy, 2011/11/29 18:01:46]

Decided to leave this as-is.

 
 void CloudPolicyDataStore::SetDeviceToken(const std::string& device_token,
                                           bool from_cache) {
   DCHECK(token_cache_loaded_ != from_cache);
   if (!token_cache_loaded_) {
     // The cache should be the first to set the token. (It may be "")
     DCHECK(from_cache);
     token_cache_loaded_ = true;
   } else {
     // The cache should never set the token later.
@@ skipping 99 matching lines @@
 
 const std::string& CloudPolicyDataStore::user_name() const {
   return user_name_;
 }
 
 CloudPolicyDataStore::UserAffiliation
     CloudPolicyDataStore::user_affiliation() const {
   return user_affiliation_;
 }
 
+DeviceStatusReporter*
+    CloudPolicyDataStore::device_status_reporter() {
+  return &device_status_reporter_;
+}
+
 void CloudPolicyDataStore::AddObserver(
     CloudPolicyDataStore::Observer* observer) {
   observer_list_.AddObserver(observer);
 }
 
 void CloudPolicyDataStore::RemoveObserver(
     CloudPolicyDataStore::Observer* observer) {
   observer_list_.RemoveObserver(observer);
 }
 
 void CloudPolicyDataStore::NotifyCredentialsChanged() {
   FOR_EACH_OBSERVER(Observer, observer_list_, OnCredentialsChanged());
 }
 
 void CloudPolicyDataStore::NotifyDeviceTokenChanged() {
   FOR_EACH_OBSERVER(Observer, observer_list_, OnDeviceTokenChanged());
 }
 
 }  // namespace policy