Add device status reports to policy requests.

chrome/browser/policy/device_management_backend_impl.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/device_management_backend_impl.h"
 
 #include <utility>
 #include <vector>
 
 #include "base/metrics/histogram.h"
@@ skipping 387 matching lines @@
 
 // Handles policy request jobs.
 class DeviceManagementPolicyJob : public DeviceManagementJobBase {
  public:
   DeviceManagementPolicyJob(
       DeviceManagementBackendImpl* backend_impl,
       const std::string& device_management_token,
       const std::string& device_id,
       const std::string& user_affiliation,
       const em::DevicePolicyRequest& request,
+      const em::DeviceStatusReportRequest* device_status,
       DeviceManagementBackend::DevicePolicyResponseDelegate* delegate)
       : DeviceManagementJobBase(
           backend_impl,
           DeviceManagementBackendImpl::kValueRequestPolicy,
           device_id),
         delegate_(delegate) {
     SetDeviceManagementToken(device_management_token);
     SetQueryParam(DeviceManagementBackendImpl::kParamUserAffiliation,
                   user_affiliation);
     em::DeviceManagementRequest request_wrapper;
     request_wrapper.mutable_policy_request()->CopyFrom(request);
+    request_wrapper.mutable_device_status_report_request()->CopyFrom(

[Mattias Nissler (ping if slow), 2011/12/06 15:20:18]

You should check whether device_status is NULL here and if so, ignore it.

[Patrick Dubroy, 2011/12/06 16:41:57]

Whoops :-) Done.

+        *device_status);
     SetPayload(request_wrapper);
   }
   virtual ~DeviceManagementPolicyJob() {}
 
  private:
   // DeviceManagementJobBase overrides.
   virtual void OnError(DeviceManagementBackend::ErrorCode error) OVERRIDE {
     MetricPolicy sample;
     switch (error) {
       case DeviceManagementBackend::kErrorRequestInvalid:
@@ skipping 127 matching lines @@
     DeviceUnregisterResponseDelegate* delegate) {
   AddJob(new DeviceManagementUnregisterJob(this, device_management_token,
                                            device_id, request, delegate));
 }
 
 void DeviceManagementBackendImpl::ProcessPolicyRequest(
     const std::string& device_management_token,
     const std::string& device_id,
     CloudPolicyDataStore::UserAffiliation affiliation,
     const em::DevicePolicyRequest& request,
+    const em::DeviceStatusReportRequest* device_status,
     DevicePolicyResponseDelegate* delegate) {
   UMA_HISTOGRAM_ENUMERATION(kMetricPolicy, kMetricPolicyFetchRequested,
                             kMetricPolicySize);
   AddJob(new DeviceManagementPolicyJob(this, device_management_token, device_id,
                                        UserAffiliationToString(affiliation),
-                                       request, delegate));
+                                       request, device_status, delegate));
 }
 
 // static
 const char* DeviceManagementBackendImpl::UserAffiliationToString(
     CloudPolicyDataStore::UserAffiliation affiliation) {
   switch (affiliation) {
     case CloudPolicyDataStore::USER_AFFILIATION_MANAGED:
       return kValueUserAffiliationManaged;
     case CloudPolicyDataStore::USER_AFFILIATION_NONE:
       return kValueUserAffiliationNone;
   }
   NOTREACHED();
   return kValueUserAffiliationNone;
 }
 
 }  // namespace policy