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>
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)) {