Always send the device ID when making device management requests.

chrome/browser/policy/mock_device_management_backend.cc

Index: chrome/browser/policy/mock_device_management_backend.cc
diff --git a/chrome/browser/policy/mock_device_management_backend.cc b/chrome/browser/policy/mock_device_management_backend.cc
index 613022f7c27fa0eb91d76f854b84a788bfbdbe92..05d2c3cf8da464b5d1faf2d17250a66e10dad9ed 100644
--- a/chrome/browser/policy/mock_device_management_backend.cc
+++ b/chrome/browser/policy/mock_device_management_backend.cc
@@ -42,7 +42,7 @@ void MockDeviceManagementBackend::AllShouldSucceed() {
       WillByDefault(Invoke(
           this,
           &MockDeviceManagementBackend::SimulateSuccessfulRegisterRequest));
-  ON_CALL(*this, ProcessPolicyRequest(_, _, _)).
+  ON_CALL(*this, ProcessPolicyRequest(_, _, _, _)).
       WillByDefault(Invoke(
           this,
           &MockDeviceManagementBackend::SimulateSuccessfulPolicyRequest));
@@ -53,7 +53,7 @@ void MockDeviceManagementBackend::AllShouldFail() {
       WillByDefault(Invoke(
           this,
           &MockDeviceManagementBackend::SimulateFailedRegisterRequest));
-  ON_CALL(*this, ProcessPolicyRequest(_, _, _)).
+  ON_CALL(*this, ProcessPolicyRequest(_, _, _, _)).
       WillByDefault(Invoke(
           this,
           &MockDeviceManagementBackend::SimulateFailedPolicyRequest));
@@ -90,6 +90,7 @@ void MockDeviceManagementBackend::SimulateSuccessfulRegisterRequest(
 
 void MockDeviceManagementBackend::SimulateSuccessfulPolicyRequest(
     const std::string& device_management_token,
+    const std::string& device_id,
     const em::DevicePolicyRequest& request,
     DevicePolicyResponseDelegate* delegate) {
   delegate->HandlePolicyResponse(policy_response_);
@@ -105,6 +106,7 @@ void MockDeviceManagementBackend::SimulateFailedRegisterRequest(
 
 void MockDeviceManagementBackend::SimulateFailedPolicyRequest(
     const std::string& device_management_token,
+    const std::string& device_id,
     const em::DevicePolicyRequest& request,
     DevicePolicyResponseDelegate* delegate) {
   delegate->OnError(kErrorRequestFailed);