Use installed DBus libraries instead of generating them.
login_manager, power_manager, debugd and shill now expose a client
library with the generated dbus-proxies.h file and the system_api's
installed dbus-constants.h. This patch changes update_engine from
generating these DBus headers to use the installed client libraries.
The client libraries already include the service path string, so we
don't need to include system_api dbus-constants.h in most cases, unless
we actually use some parameter constants defined there.
BUG=b:23084776,b:23560718
TEST=./build_packages --board=link
Change-Id: Idb4501e784ebb5928c92902d114462be57d5826a
diff --git a/dbus_service_unittest.cc b/dbus_service_unittest.cc
index a00cd37..824ea71 100644
--- a/dbus_service_unittest.cc
+++ b/dbus_service_unittest.cc
@@ -22,16 +22,16 @@
#include <chromeos/errors/error.h>
#include <policy/libpolicy.h>
#include <policy/mock_device_policy.h>
+#include <update_engine/dbus-constants.h>
-#include "update_engine/dbus_constants.h"
#include "update_engine/fake_system_state.h"
+using chromeos::errors::dbus::kDomain;
using std::string;
using testing::Return;
using testing::SetArgumentPointee;
using testing::_;
-
-using chromeos::errors::dbus::kDomain;
+using update_engine::kUpdateEngineServiceErrorFailed;
namespace chromeos_update_engine {
@@ -69,7 +69,8 @@
"app_ver", "url", false /* interactive */));
// The update is non-interactive when we pass the non-interactive flag.
EXPECT_TRUE(dbus_service_.AttemptUpdateWithFlags(
- &error_, "app_ver", "url", kAttemptUpdateFlagNonInteractive));
+ &error_, "app_ver", "url",
+ update_engine::kAttemptUpdateFlagNonInteractive));
EXPECT_EQ(nullptr, error_);
}