Match server version of DM API proto.

components/policy/core/common/remote_commands/remote_commands_queue_unittest.cc

 // Copyright 2015 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/remote_commands/remote_commands_queue.h"
 
 #include <string>
 #include <utility>
 
 #include "base/macros.h"
@@ skipping 18 matching lines @@
 const RemoteCommandJob::UniqueIDType kUniqueID2 = 987654321;
 const char kPayload[] = "_PAYLOAD_FOR_TESTING_";
 const char kPayload2[] = "_PAYLOAD_FOR_TESTING2_";
 
 em::RemoteCommand GenerateCommandProto(RemoteCommandJob::UniqueIDType unique_id,
                                        base::TimeDelta age_of_command,
                                        const std::string& payload) {
   em::RemoteCommand command_proto;
   command_proto.set_type(
       enterprise_management::RemoteCommand_Type_COMMAND_ECHO_TEST);
-  command_proto.set_unique_id(unique_id);
+  command_proto.set_command_id(unique_id);
   command_proto.set_age_of_command(age_of_command.InMilliseconds());
   if (!payload.empty())
     command_proto.set_payload(payload);
   return command_proto;
 }
 
 // Mock class for RemoteCommandsQueue::Observer.
 class MockRemoteCommandsQueueObserver : public RemoteCommandsQueue::Observer {
  public:
   MockRemoteCommandsQueueObserver() {}
@@ skipping 275 matching lines @@
           Property(&RemoteCommandJob::status, RemoteCommandJob::SUCCEEDED),
           Property(&RemoteCommandJob::GetResultPayload,
                    Pointee(StrEq(kPayload2))))));
   task_runner_->FastForwardBy(base::TimeDelta::FromSeconds(5));
   Mock::VerifyAndClearExpectations(&observer_);
 
   task_runner_->FastForwardUntilNoTasksRemain();
 }
 
 }  // namespace policy