Match server version of DM API proto.

components/policy/core/common/cloud/cloud_policy_client_unittest.cc

 // Copyright (c) 2012 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 "components/policy/core/common/cloud/cloud_policy_client.h"
 
 #include <stddef.h>
 #include <stdint.h>
 
 #include <map>
@@ skipping 122 matching lines @@
     upload_certificate_response_.mutable_cert_upload_response();
 
     upload_status_request_.mutable_device_status_report_request();
     upload_status_request_.mutable_session_status_report_request();
 
     remote_command_request_.mutable_remote_command_request()
         ->set_last_command_unique_id(kLastCommandId);
     em::RemoteCommandResult* command_result =
         remote_command_request_.mutable_remote_command_request()
             ->add_command_results();
-    command_result->set_unique_id(kLastCommandId);
+    command_result->set_command_id(kLastCommandId);
     command_result->set_result(
         em::RemoteCommandResult_ResultType_RESULT_SUCCESS);
     command_result->set_payload(kResultPayload);
     command_result->set_timestamp(kTimestamp);
 
     em::RemoteCommand* command =
         remote_command_response_.mutable_remote_command_response()
             ->add_commands();
     command->set_age_of_command(kAgeOfCommand);
     command->set_payload(kPayload);
-    command->set_unique_id(kLastCommandId + 1);
+    command->set_command_id(kLastCommandId + 1);
     command->set_type(em::RemoteCommand_Type_COMMAND_ECHO_TEST);
 
     attribute_update_permission_request_.
         mutable_device_attribute_update_permission_request();
     attribute_update_permission_response_.
         mutable_device_attribute_update_permission_response()->
         set_result(
             em::DeviceAttributeUpdatePermissionResponse_ResultType_ATTRIBUTE_UPDATE_ALLOWED);
 
     attribute_update_request_.mutable_device_attribute_update_request()->
@@ skipping 786 matching lines @@
   EXPECT_CALL(callback_observer_, OnCallbackComplete(true)).Times(1);
 
   CloudPolicyClient::StatusCallback callback =
       base::Bind(&MockStatusCallbackObserver::OnCallbackComplete,
                  base::Unretained(&callback_observer_));
   client_->UpdateGcmId(kGcmID, callback);
   EXPECT_EQ(DM_STATUS_SUCCESS, client_->status());
 }
 
 }  // namespace policy