Always send the device ID when making device management requests.

chrome/browser/policy/device_management_service_browsertest.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 "base/message_loop.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/policy/device_management_backend_mock.h"
 #include "chrome/browser/policy/device_management_service.h"
 #include "chrome/browser/profile.h"
 #include "chrome/browser/ui/browser.h"
@@ skipping 85 matching lines @@
 
   {
     CannedResponseInterceptor interceptor(
         GURL(kServiceUrl), PROTO_STRING(kServiceResponseRegister));
     DeviceRegisterResponseDelegateMock delegate;
     EXPECT_CALL(delegate, HandleRegisterResponse(_))
         .WillOnce(DoAll(Invoke(this, &DeviceManagementServiceIntegrationTest
                                           ::CaptureToken),
                         InvokeWithoutArgs(QuitMessageLoop)));
     em::DeviceRegisterRequest request;
-    backend->ProcessRegisterRequest("token", "device id", request, &delegate);
+    backend->ProcessRegisterRequest("token", "testid", request, &delegate);
     MessageLoop::current()->Run();
   }
 
   {
     CannedResponseInterceptor interceptor(
         GURL(kServiceUrl), PROTO_STRING(kServiceResponsePolicy));
     DevicePolicyResponseDelegateMock delegate;
     EXPECT_CALL(delegate, HandlePolicyResponse(_))
         .WillOnce(InvokeWithoutArgs(QuitMessageLoop));
     em::DevicePolicyRequest request;
     request.set_policy_scope("chrome");
     em::DevicePolicySettingRequest* setting_request =
         request.add_setting_request();
     setting_request->set_key("policy");
-    backend->ProcessPolicyRequest(token_, request, &delegate);
+    backend->ProcessPolicyRequest(token_, "testid", request, &delegate);
 
     MessageLoop::current()->Run();
   }
 
   {
     CannedResponseInterceptor interceptor(
         GURL(kServiceUrl), PROTO_STRING(kServiceResponseUnregister));
     DeviceUnregisterResponseDelegateMock delegate;
     EXPECT_CALL(delegate, HandleUnregisterResponse(_))
         .WillOnce(InvokeWithoutArgs(QuitMessageLoop));
     em::DeviceUnregisterRequest request;
-    backend->ProcessUnregisterRequest(token_, request, &delegate);
+    backend->ProcessUnregisterRequest(token_, "testid", request, &delegate);
 
     MessageLoop::current()->Run();
   }
 }
 
 IN_PROC_BROWSER_TEST_F(DeviceManagementServiceIntegrationTest,
                        WithTestServer) {
   net::TestServer test_server_(
       net::TestServer::TYPE_HTTP,
       FilePath(FILE_PATH_LITERAL("chrome/test/data/policy")));
   ASSERT_TRUE(test_server_.Start());
   DeviceManagementService service(
       test_server_.GetURL("device_management").spec());
   service.Initialize(browser()->profile()->GetRequestContext());
   scoped_ptr<DeviceManagementBackend> backend(service.CreateBackend());
 
   {
     DeviceRegisterResponseDelegateMock delegate;
     EXPECT_CALL(delegate, HandleRegisterResponse(_))
         .WillOnce(DoAll(Invoke(this, &DeviceManagementServiceIntegrationTest
                                           ::CaptureToken),
                         InvokeWithoutArgs(QuitMessageLoop)));
     em::DeviceRegisterRequest request;
-    backend->ProcessRegisterRequest("token", "device id", request, &delegate);
+    backend->ProcessRegisterRequest("token", "testid", request, &delegate);
     MessageLoop::current()->Run();
   }
 
   {
     em::DevicePolicyResponse expected_response;
 
     DevicePolicyResponseDelegateMock delegate;
     EXPECT_CALL(delegate, HandlePolicyResponse(_))
         .WillOnce(InvokeWithoutArgs(QuitMessageLoop));
     em::DevicePolicyRequest request;
     request.set_policy_scope("chrome");
     em::DevicePolicySettingRequest* setting_request =
         request.add_setting_request();
     setting_request->set_key("policy");
-    backend->ProcessPolicyRequest(token_, request, &delegate);
+    backend->ProcessPolicyRequest(token_, "testid", request, &delegate);
 
     MessageLoop::current()->Run();
   }
 
   {
     DeviceUnregisterResponseDelegateMock delegate;
     EXPECT_CALL(delegate, HandleUnregisterResponse(_))
         .WillOnce(InvokeWithoutArgs(QuitMessageLoop));
     em::DeviceUnregisterRequest request;
-    backend->ProcessUnregisterRequest(token_, request, &delegate);
+    backend->ProcessUnregisterRequest(token_, "testid", request, &delegate);
 
     MessageLoop::current()->Run();
   }
 }
 
 }  // namespace policy