Initial RemoteCommandService

components/policy/core/common/cloud/cloud_policy_client.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 "base/bind.h"
 #include "base/guid.h"
 #include "base/logging.h"
 #include "base/stl_util.h"
@@ skipping 243 matching lines @@
   scoped_ptr<DeviceManagementRequestJob> request_job(
       service_->CreateJob(DeviceManagementRequestJob::TYPE_UPLOAD_CERTIFICATE,
                           GetRequestContext()));
   request_job->SetDMToken(dm_token_);
   request_job->SetClientID(client_id_);
 
   em::DeviceManagementRequest* request = request_job->GetRequest();
   request->mutable_cert_upload_request()->set_device_certificate(
       certificate_data);
 
-  DeviceManagementRequestJob::Callback job_callback = base::Bind(
-      &CloudPolicyClient::OnCertificateUploadCompleted,
-      base::Unretained(this),
-      request_job.get(),
-      callback);
+  const DeviceManagementRequestJob::Callback job_callback =
+      base::Bind(&CloudPolicyClient::OnCertificateUploadCompleted,
+                 base::Unretained(this), request_job.get(), callback);

[bartfab (slow), 2015/02/28 00:01:22]

Nit: #include "base/bind_helpers.h"

[binjin, 2015/02/28 02:18:04]

Done.

+
   request_jobs_.push_back(request_job.Pass());
   request_jobs_.back()->Start(job_callback);
 }
 
 void CloudPolicyClient::UploadDeviceStatus(
     const em::DeviceStatusReportRequest* device_status,
     const em::SessionStatusReportRequest* session_status,
     const CloudPolicyClient::StatusCallback& callback) {
   CHECK(is_registered());
   // Should pass in at least one type of status.
   DCHECK(device_status || session_status);
   scoped_ptr<DeviceManagementRequestJob> request_job(
       service_->CreateJob(DeviceManagementRequestJob::TYPE_UPLOAD_STATUS,
                           GetRequestContext()));
   request_job->SetDMToken(dm_token_);
   request_job->SetClientID(client_id_);
 
   em::DeviceManagementRequest* request = request_job->GetRequest();
   if (device_status)
     *request->mutable_device_status_report_request() = *device_status;
   if (session_status)
     *request->mutable_session_status_report_request() = *session_status;
 
-  DeviceManagementRequestJob::Callback job_callback = base::Bind(
-      &CloudPolicyClient::OnStatusUploadCompleted,
-      base::Unretained(this),
-      request_job.get(),
-      callback);
+  const DeviceManagementRequestJob::Callback job_callback =
+      base::Bind(&CloudPolicyClient::OnStatusUploadCompleted,
+                 base::Unretained(this), request_job.get(), callback);
 
   request_jobs_.push_back(request_job.Pass());
   request_jobs_.back()->Start(job_callback);
+}
+
+void CloudPolicyClient::FetchRemoteCommands(
+    RemoteCommandJob::UniqueIDType last_command_id,
+    const std::vector<em::RemoteCommandResult>& command_results,
+    const RemoteCommandCallback& callback) {
+  CHECK(is_registered());
+  scoped_ptr<DeviceManagementRequestJob> request_job(service_->CreateJob(
+      DeviceManagementRequestJob::TYPE_REMOTE_COMMANDS, GetRequestContext()));
+
+  request_job->SetDMToken(dm_token_);
+  request_job->SetClientID(client_id_);
+
+  em::DeviceRemoteCommandRequest* request =

[bartfab (slow), 2015/02/28 00:01:22]

Nit: const.

[binjin, 2015/02/28 02:18:04]

I'm not sure since it's pointer mutable protobuf. Used constant pointer instead.

[bartfab (slow), 2015/03/10 16:09:20]

Thanks. const pointer is what I meant.

[binjin, 2015/03/12 11:03:15]

Acknowledged.

+      request_job->GetRequest()->mutable_remote_command_request();
+
+  request->set_last_command_unique_id(last_command_id);
+
+  for (const auto& command_result : command_results)
+    *request->add_command_results() = command_result;
+
+  const DeviceManagementRequestJob::Callback job_callback = base::Bind(

[bartfab (slow), 2015/02/28 00:01:22]

Why the nested base::Bind()?

[binjin, 2015/02/28 02:18:04]

Done.

+      base::Bind(&CloudPolicyClient::OnRemoteCommandsFetched,
+                 base::Unretained(this), request_job.get(), callback));
+
+  request_jobs_.push_back(request_job.Pass());
+  request_jobs_.back()->Start(job_callback);
 }
 
 void CloudPolicyClient::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void CloudPolicyClient::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
@@ skipping 199 matching lines @@
     const enterprise_management::DeviceManagementResponse& response) {
   status_ = status;
   if (status != DM_STATUS_SUCCESS)
     NotifyClientError();
 
   callback.Run(status == DM_STATUS_SUCCESS);
   // Must call RemoveJob() last, because it frees |callback|.
   RemoveJob(job);
 }
 
+void CloudPolicyClient::OnRemoteCommandsFetched(
+    const DeviceManagementRequestJob* job,
+    const RemoteCommandCallback& callback,
+    DeviceManagementStatus status,
+    int net_error,
+    const enterprise_management::DeviceManagementResponse& response) {
+  std::vector<enterprise_management::RemoteCommand> commands;
+  if (status == DM_STATUS_SUCCESS && response.has_remote_command_response()) {
+    for (const auto& command : response.remote_command_response().commands())
+      commands.push_back(command);
+  } else {
+    NotifyClientError();

[bartfab (slow), 2015/02/28 00:01:22]

NotifyClientError() will tell all consumers that something went wrong. If there
are e.g. a policy fetch and a remote command fetch in flight at the same time,
the classes responsible for these will both get an error callback and will be
unable to tell which one of their requests failed. How about you also report the
status as part of |RemoteCommandCallback|?

[binjin, 2015/02/28 02:18:04]

Done.

+  }
+  callback.Run(commands);
+  // Must call RemoveJob() last, because it frees |callback|.
+  RemoveJob(job);
+}
+
 void CloudPolicyClient::NotifyPolicyFetched() {
   FOR_EACH_OBSERVER(Observer, observers_, OnPolicyFetched(this));
 }
 
 void CloudPolicyClient::NotifyRegistrationStateChanged() {
   FOR_EACH_OBSERVER(Observer, observers_, OnRegistrationStateChanged(this));
 }
 
 void CloudPolicyClient::NotifyRobotAuthCodesFetched() {
   FOR_EACH_OBSERVER(Observer, observers_, OnRobotAuthCodesFetched(this));
 }
 
 void CloudPolicyClient::NotifyClientError() {
   FOR_EACH_OBSERVER(Observer, observers_, OnClientError(this));
 }
 
 }  // namespace policy