Add device status reports to policy requests.

chrome/browser/policy/cloud_policy_controller.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_controller.h"
 
 #include <algorithm>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 238 matching lines @@
       SetState(STATE_TOKEN_UNMANAGED);
     }
   }
 }
 
 void CloudPolicyController::SendPolicyRequest() {
   backend_.reset(service_->CreateBackend());
   DCHECK(!data_store_->device_token().empty());
   em::DevicePolicyRequest policy_request;
   em::PolicyFetchRequest* fetch_request = policy_request.add_request();
+  em::DeviceStatusReportRequest device_status;
   fetch_request->set_signature_type(em::PolicyFetchRequest::SHA1_RSA);
   fetch_request->set_policy_type(data_store_->policy_type());
   if (!cache_->is_unmanaged() &&
       !cache_->last_policy_refresh_time().is_null()) {
     base::TimeDelta timestamp =
         cache_->last_policy_refresh_time() - base::Time::UnixEpoch();
     fetch_request->set_timestamp(timestamp.InMilliseconds());
   }
   int key_version = 0;
   if (cache_->GetPublicKeyVersion(&key_version))
     fetch_request->set_public_key_version(key_version);
 
+  data_store_->device_status_reporter()->GetStatus(&device_status);
+
   backend_->ProcessPolicyRequest(data_store_->device_token(),
                                  data_store_->device_id(),
                                  data_store_->user_affiliation(),
-                                 policy_request, this);
+                                 policy_request, device_status, this);

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

One thing: We should reset our status counters after this request has succeeded.
Actually, we should probably reset right away in order to not lose state info
generated while the request is in flight...

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

Yeah, I was sure whether I should reset the data as soon as its collected, or
once the request succeeds. In either case, we could lose data.

 }
 
 void CloudPolicyController::DoWork() {
   switch (state_) {
     case STATE_TOKEN_UNAVAILABLE:
     case STATE_TOKEN_ERROR:
       FetchToken();
       return;
     case STATE_TOKEN_VALID:
     case STATE_POLICY_VALID:
@@ skipping 93 matching lines @@
 }
 
 int64 CloudPolicyController::GetRefreshDelay() {
   int64 deviation = (kPolicyRefreshDeviationFactorPercent *
                      policy_refresh_rate_ms_) / 100;
   deviation = std::min(deviation, kPolicyRefreshDeviationMaxInMilliseconds);
   return policy_refresh_rate_ms_ - base::RandGenerator(deviation + 1);
 }
 
 }  // namespace policy