commit 9b66aa677f82c711b661d2f5dde49ff806514c5f
author Amin Hassani <ahassani@chromium.org> Thu Mar 14 14:13:30 2019 -0700
committer chrome-bot <chrome-bot@chromium.org> Wed Mar 20 15:32:35 2019 -0700
tree 651c0b448ceabc2f2607e5e8ba14ce32d39de8ea
parent 7c41bbfa118140f0a48335bea367708ca071d2ae

update_engine: Use dlcservice.proto instead of update_engine.proto

system_api/dbus/update_engine/update_engine.proto and
system_api/dbus/dlcservice/dlcservice.proto are basically the same
thing. They providesf a mechanism to transfer information about DLCs
from dlcservice to update_engine and vice verse. So having only one copy
of it makes it easier to maintain and extend in the future.

BUG=chromium:898340
TEST=precq
CQ-DEPEND=CL:1524873

Change-Id: Ieacea209d289c1bac86e5daa2392b3e3e6908124
Reviewed-on: https://chromium-review.googlesource.com/1525022
Commit-Ready: Amin Hassani <ahassani@chromium.org>
Tested-by: Amin Hassani <ahassani@chromium.org>
Reviewed-by: Nicolas Norvez <norvez@chromium.org>
Reviewed-by: Xiaochu Liu <xiaochu@chromium.org>

client_library/client_dbus.cc

diff --git a/client_library/client_dbus.cc b/client_library/client_dbus.cc
index 7ca6307..3ffb088 100644
--- a/client_library/client_dbus.cc
+++ b/client_library/client_dbus.cc
@@ -19,8 +19,8 @@
 #include <base/message_loop/message_loop.h>
 
 #include <dbus/bus.h>
+#include <dlcservice/proto_bindings/dlcservice.pb.h>
 #include <update_engine/dbus-constants.h>
-#include <update_engine/proto_bindings/update_engine.pb.h>
 
 #include "update_engine/update_status_utils.h"
 
@@ -57,14 +57,15 @@
       nullptr);
 }
 
-bool DBusUpdateEngineClient::AttemptInstall(
-    const string& omaha_url, const vector<string>& dlc_module_ids) {
+bool DBusUpdateEngineClient::AttemptInstall(const string& omaha_url,
+                                            const vector<string>& dlc_ids) {
   // Convert parameters into protobuf.
-  chromeos_update_engine::DlcParameters dlc_parameters;
+  dlcservice::DlcModuleList dlc_parameters;
   dlc_parameters.set_omaha_url(omaha_url);
-  for (const auto& dlc_module_id : dlc_module_ids) {
-    chromeos_update_engine::DlcInfo* dlc_info = dlc_parameters.add_dlc_infos();
-    dlc_info->set_dlc_id(dlc_module_id);
+  for (const auto& dlc_id : dlc_ids) {
+    dlcservice::DlcModuleInfo* dlc_module_info =
+        dlc_parameters.add_dlc_module_infos();
+    dlc_module_info->set_dlc_id(dlc_id);
   }
   string dlc_request;
   if (dlc_parameters.SerializeToString(&dlc_request)) {

dbus_service.cc

diff --git a/dbus_service.cc b/dbus_service.cc
index 7296053..2a5662f 100644
--- a/dbus_service.cc
+++ b/dbus_service.cc
@@ -19,8 +19,8 @@
 #include <string>
 #include <vector>
 
+#include <dlcservice/proto_bindings/dlcservice.pb.h>
 #include <update_engine/dbus-constants.h>
-#include <update_engine/proto_bindings/update_engine.pb.h>
 
 #include "update_engine/dbus_connection.h"
 #include "update_engine/update_status_utils.h"
@@ -65,24 +65,23 @@
 bool DBusUpdateEngineService::AttemptInstall(ErrorPtr* error,
                                              const string& dlc_request) {
   // Parse the raw parameters into protobuf.
-  DlcParameters dlc_parameters;
+  dlcservice::DlcModuleList dlc_parameters;
   if (!dlc_parameters.ParseFromString(dlc_request)) {
     *error = brillo::Error::Create(
         FROM_HERE, "update_engine", "INTERNAL", "parameters are invalid.");
     return false;
   }
   // Extract fields from the protobuf.
-  vector<string> dlc_module_ids;
-  for (const auto& dlc_info : dlc_parameters.dlc_infos()) {
-    if (dlc_info.dlc_id().empty()) {
+  vector<string> dlc_ids;
+  for (const auto& dlc_module_info : dlc_parameters.dlc_module_infos()) {
+    if (dlc_module_info.dlc_id().empty()) {
       *error = brillo::Error::Create(
           FROM_HERE, "update_engine", "INTERNAL", "parameters are invalid.");
       return false;
     }
-    dlc_module_ids.push_back(dlc_info.dlc_id());
+    dlc_ids.push_back(dlc_module_info.dlc_id());
   }
-  return common_->AttemptInstall(
-      error, dlc_parameters.omaha_url(), dlc_module_ids);
+  return common_->AttemptInstall(error, dlc_parameters.omaha_url(), dlc_ids);
 }
 
 bool DBusUpdateEngineService::AttemptRollback(ErrorPtr* error,