Always send the device ID when making device management requests.

chrome/browser/policy/mock_device_management_backend.h

Index: chrome/browser/policy/mock_device_management_backend.h
diff --git a/chrome/browser/policy/mock_device_management_backend.h b/chrome/browser/policy/mock_device_management_backend.h
index f0612f408cc20fb566d71c6e3ac2d6b26f4752e3..6b3258c6b34e08bb9f9791661384a28e8ef98ce0 100644
--- a/chrome/browser/policy/mock_device_management_backend.h
+++ b/chrome/browser/policy/mock_device_management_backend.h
@@ -34,13 +34,15 @@ class MockDeviceManagementBackend
       const em::DeviceRegisterRequest& request,
       DeviceRegisterResponseDelegate* delegate));
 
-  MOCK_METHOD3(ProcessUnregisterRequest, void(
+  MOCK_METHOD4(ProcessUnregisterRequest, void(
       const std::string& device_management_token,
+      const std::string& device_id,
       const em::DeviceUnregisterRequest& request,
       DeviceUnregisterResponseDelegate* delegate));
 
-  MOCK_METHOD3(ProcessPolicyRequest, void(
+  MOCK_METHOD4(ProcessPolicyRequest, void(
       const std::string& device_management_token,
+      const std::string& device_id,
       const em::DevicePolicyRequest& request,
       DevicePolicyResponseDelegate* delegate));
 
@@ -56,6 +58,7 @@ class MockDeviceManagementBackend
 
   void SimulateSuccessfulPolicyRequest(
       const std::string& device_management_token,
+      const std::string& device_id,
       const em::DevicePolicyRequest& request,
       DevicePolicyResponseDelegate* delegate);
 
@@ -67,6 +70,7 @@ class MockDeviceManagementBackend
 
   void SimulateFailedPolicyRequest(
       const std::string& device_management_token,
+      const std::string& device_id,
       const em::DevicePolicyRequest& request,
       DevicePolicyResponseDelegate* delegate);