Split DBus client proxies into separated headers.
Each daemon we talk to should expose its own DBus library. This patch
splits the DBus proxies we generate from other daemon's .xml files into
separated header files so we can then replace them with libraries.
BUG=b:23084776
TEST=FEATURES=test emerge-link update_engine
Change-Id: Idbf1671eb7fc4259d493dbe2c8bcc8dad5b8784f
diff --git a/update_manager/real_device_policy_provider.h b/update_manager/real_device_policy_provider.h
index 2952e5c..1553db3 100644
--- a/update_manager/real_device_policy_provider.h
+++ b/update_manager/real_device_policy_provider.h
@@ -24,7 +24,7 @@
#include <gtest/gtest_prod.h> // for FRIEND_TEST
#include <policy/libpolicy.h>
-#include "update_engine/dbus_proxies.h"
+#include "login_manager/dbus-proxies.h"
#include "update_engine/update_manager/device_policy_provider.h"
#include "update_engine/update_manager/generic_variables.h"
diff --git a/update_manager/real_device_policy_provider_unittest.cc b/update_manager/real_device_policy_provider_unittest.cc
index b49074f..bd59589 100644
--- a/update_manager/real_device_policy_provider_unittest.cc
+++ b/update_manager/real_device_policy_provider_unittest.cc
@@ -27,7 +27,8 @@
#include <policy/mock_device_policy.h>
#include <policy/mock_libpolicy.h>
-#include "update_engine/dbus_mocks.h"
+#include "login_manager/dbus-proxies.h"
+#include "login_manager/dbus-proxy-mocks.h"
#include "update_engine/dbus_test_utils.h"
#include "update_engine/test_utils.h"
#include "update_engine/update_manager/umtest_utils.h"
diff --git a/update_manager/real_shill_provider.cc b/update_manager/real_shill_provider.cc
index ab4900d..065eac3 100644
--- a/update_manager/real_shill_provider.cc
+++ b/update_manager/real_shill_provider.cc
@@ -22,6 +22,8 @@
#include <base/strings/stringprintf.h>
#include <chromeos/dbus/service_constants.h>
+#include "shill/dbus-proxies.h"
+
using org::chromium::flimflam::ManagerProxyInterface;
using org::chromium::flimflam::ServiceProxyInterface;
using std::string;
diff --git a/update_manager/real_shill_provider.h b/update_manager/real_shill_provider.h
index 6df5568..2184ac2 100644
--- a/update_manager/real_shill_provider.h
+++ b/update_manager/real_shill_provider.h
@@ -26,7 +26,6 @@
#include <base/time/time.h>
#include "update_engine/clock_interface.h"
-#include "update_engine/dbus_proxies.h"
#include "update_engine/shill_proxy_interface.h"
#include "update_engine/update_manager/generic_variables.h"
#include "update_engine/update_manager/shill_provider.h"
diff --git a/update_manager/real_shill_provider_unittest.cc b/update_manager/real_shill_provider_unittest.cc
index 2c493e1..4ba2708 100644
--- a/update_manager/real_shill_provider_unittest.cc
+++ b/update_manager/real_shill_provider_unittest.cc
@@ -25,8 +25,8 @@
#include <gmock/gmock.h>
#include <gtest/gtest.h>
-#include "update_engine/dbus_mocks.h"
-#include "update_engine/dbus_proxies.h"
+#include "shill/dbus-proxies.h"
+#include "shill/dbus-proxy-mocks.h"
#include "update_engine/dbus_test_utils.h"
#include "update_engine/fake_clock.h"
#include "update_engine/fake_shill_proxy.h"
diff --git a/update_manager/state_factory.h b/update_manager/state_factory.h
index caf38e3..e39a74d 100644
--- a/update_manager/state_factory.h
+++ b/update_manager/state_factory.h
@@ -17,7 +17,7 @@
#ifndef UPDATE_ENGINE_UPDATE_MANAGER_STATE_FACTORY_H_
#define UPDATE_ENGINE_UPDATE_MANAGER_STATE_FACTORY_H_
-#include "update_engine/dbus_proxies.h"
+#include "login_manager/dbus-proxies.h"
#include "update_engine/shill_proxy.h"
#include "update_engine/system_state.h"
#include "update_engine/update_manager/state.h"