Always send the device ID when making device management requests.

chrome/browser/policy/mock_device_management_backend.cc

 // Copyright (c) 2010 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/mock_device_management_backend.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/stl_util-inl.h"
 
@@ skipping 24 matching lines @@
 }
 
 MockDeviceManagementBackend::~MockDeviceManagementBackend() {
 }
 
 void MockDeviceManagementBackend::AllShouldSucceed() {
   ON_CALL(*this, ProcessRegisterRequest(_, _, _, _)).
       WillByDefault(Invoke(
           this,
           &MockDeviceManagementBackend::SimulateSuccessfulRegisterRequest));
-  ON_CALL(*this, ProcessPolicyRequest(_, _, _)).
+  ON_CALL(*this, ProcessPolicyRequest(_, _, _, _)).
       WillByDefault(Invoke(
           this,
           &MockDeviceManagementBackend::SimulateSuccessfulPolicyRequest));
 }
 
 void MockDeviceManagementBackend::AllShouldFail() {
   ON_CALL(*this, ProcessRegisterRequest(_, _, _, _)).
       WillByDefault(Invoke(
           this,
           &MockDeviceManagementBackend::SimulateFailedRegisterRequest));
-  ON_CALL(*this, ProcessPolicyRequest(_, _, _)).
+  ON_CALL(*this, ProcessPolicyRequest(_, _, _, _)).
       WillByDefault(Invoke(
           this,
           &MockDeviceManagementBackend::SimulateFailedPolicyRequest));
 }
 
 void MockDeviceManagementBackend::UnmanagedDevice() {
   ON_CALL(*this, ProcessRegisterRequest(_, _, _, _)).
       WillByDefault(Invoke(
           this,
           &MockDeviceManagementBackend::SimulateUnmanagedRegisterRequest));
@@ skipping 16 matching lines @@
     DeviceRegisterResponseDelegate* delegate) {
   DeviceRegisterResponse response;
   std::string token(kFakeDeviceManagementToken);
   token += next_token_suffix_++;
   response.set_device_management_token(token);
   delegate->HandleRegisterResponse(response);
 }
 
 void MockDeviceManagementBackend::SimulateSuccessfulPolicyRequest(
     const std::string& device_management_token,
+    const std::string& device_id,
     const em::DevicePolicyRequest& request,
     DevicePolicyResponseDelegate* delegate) {
   delegate->HandlePolicyResponse(policy_response_);
 }
 
 void MockDeviceManagementBackend::SimulateFailedRegisterRequest(
     const std::string& auth_token,
     const std::string& device_id,
     const em::DeviceRegisterRequest& request,
     DeviceRegisterResponseDelegate* delegate) {
   delegate->OnError(kErrorRequestFailed);
 }
 
 void MockDeviceManagementBackend::SimulateFailedPolicyRequest(
     const std::string& device_management_token,
+    const std::string& device_id,
     const em::DevicePolicyRequest& request,
     DevicePolicyResponseDelegate* delegate) {
   delegate->OnError(kErrorRequestFailed);
 }
 
 void MockDeviceManagementBackend::SimulateUnmanagedRegisterRequest(
     const std::string& auth_token,
     const std::string& device_id,
     const em::DeviceRegisterRequest& request,
     DeviceRegisterResponseDelegate* delegate) {
   delegate->OnError(kErrorServiceManagementNotSupported);
 }
 
 }  // namespace