Add device status reports to policy requests.

chrome/browser/policy/device_management_service_unittest.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 <ostream>
 #include <vector>
 
 #include "base/message_loop.h"
 #include "base/string_split.h"
 #include "chrome/browser/policy/device_management_backend_impl.h"
@@ skipping 130 matching lines @@
   fetcher->set_status(GetParam().request_status_);
   fetcher->set_response_code(GetParam().http_status_);
   fetcher->SetResponseString(GetParam().response_);
   fetcher->delegate()->OnURLFetchComplete(fetcher);
 }
 
 TEST_P(DeviceManagementServiceFailedRequestTest, PolicyRequest) {
   DevicePolicyResponseDelegateMock mock;
   EXPECT_CALL(mock, OnError(GetParam().expected_error_));
   em::DevicePolicyRequest request;
+  em::DeviceStatusReportRequest device_status;
   request.set_policy_scope(kChromePolicyScope);
   em::DevicePolicySettingRequest* setting_request =
       request.add_setting_request();
   setting_request->set_key(kChromeDevicePolicySettingKey);
   backend_->ProcessPolicyRequest(kDMToken, kDeviceId,
                                  CloudPolicyDataStore::USER_AFFILIATION_NONE,
-                                 request, &mock);
+                                 request, device_status, &mock);
   TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
   ASSERT_TRUE(fetcher);
 
   fetcher->set_url(GURL(kServiceUrl));
   fetcher->set_status(GetParam().request_status_);
   fetcher->set_response_code(GetParam().http_status_);
   fetcher->SetResponseString(GetParam().response_);
   fetcher->delegate()->OnURLFetchComplete(fetcher);
 }
 
@@ skipping 249 matching lines @@
   ASSERT_TRUE(fetcher);
 
   // There shouldn't be any callbacks.
   backend_.reset();
 }
 
 TEST_F(DeviceManagementServiceTest, CancelPolicyRequest) {
   DevicePolicyResponseDelegateMock mock;
   EXPECT_CALL(mock, HandlePolicyResponse(_)).Times(0);
   em::DevicePolicyRequest request;
+  em::DeviceStatusReportRequest device_status;
   request.set_policy_scope(kChromePolicyScope);
   em::DevicePolicySettingRequest* setting_request =
       request.add_setting_request();
   setting_request->set_key(kChromeDevicePolicySettingKey);
   setting_request->set_watermark("stale");
   backend_->ProcessPolicyRequest(kDMToken, kDeviceId,
                                  CloudPolicyDataStore::USER_AFFILIATION_NONE,
-                                 request, &mock);
+                                 request, device_status, &mock);
   TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
   ASSERT_TRUE(fetcher);
 
   // There shouldn't be any callbacks.
   backend_.reset();
 }
 
 TEST_F(DeviceManagementServiceTest, JobQueueing) {
   // Start with a non-initialized service.
   ResetService();
@@ skipping 25 matching lines @@
   fetcher->set_status(status);
   fetcher->set_response_code(200);
   fetcher->SetResponseString(response_data);
   fetcher->delegate()->OnURLFetchComplete(fetcher);
 }
 
 TEST_F(DeviceManagementServiceTest, CancelRequestAfterShutdown) {
   DevicePolicyResponseDelegateMock mock;
   EXPECT_CALL(mock, HandlePolicyResponse(_)).Times(0);
   em::DevicePolicyRequest request;
+  em::DeviceStatusReportRequest device_status;
   request.set_policy_scope(kChromePolicyScope);
   em::DevicePolicySettingRequest* setting_request =
       request.add_setting_request();
   setting_request->set_key(kChromeDevicePolicySettingKey);
   setting_request->set_watermark("stale");
   backend_->ProcessPolicyRequest(kDMToken, kDeviceId,
                                  CloudPolicyDataStore::USER_AFFILIATION_NONE,
-                                 request, &mock);
+                                 request, device_status, &mock);
   TestURLFetcher* fetcher = factory_.GetFetcherByID(0);
   ASSERT_TRUE(fetcher);
 
   // Shutdown the service and cancel the job afterwards.
   service_->Shutdown();
   backend_.reset();
 }
 
 TEST_F(DeviceManagementServiceTest, CancelDuringCallback) {
   // Make a request.
@@ skipping 80 matching lines @@
 
   // Verify that a new URLFetcher was started that bypasses the proxy.
   fetcher = factory_.GetFetcherByID(0);
   ASSERT_TRUE(fetcher);
   EXPECT_TRUE((fetcher->GetLoadFlags() & net::LOAD_BYPASS_PROXY) != 0);
   EXPECT_EQ(original_url, fetcher->GetOriginalURL());
   EXPECT_EQ(upload_data, fetcher->upload_data());
 }
 
 }  // namespace policy