Index: chromeos/dbus/dbus_client_bundle.cc |
diff --git a/chromeos/dbus/dbus_client_bundle.cc b/chromeos/dbus/dbus_client_bundle.cc |
index 37de109435c971c9e41437335b44377c1d27d6f7..e3ab021b5bd6cf2c70342a23742411560fd72fed 100644 |
--- a/chromeos/dbus/dbus_client_bundle.cc |
+++ b/chromeos/dbus/dbus_client_bundle.cc |
@@ -37,7 +37,6 @@ |
#include "chromeos/dbus/fake_nfc_tag_client.h" |
#include "chromeos/dbus/fake_peer_daemon_manager_client.h" |
#include "chromeos/dbus/fake_permission_broker_client.h" |
-#include "chromeos/dbus/fake_privet_daemon_manager_client.h" |
#include "chromeos/dbus/fake_shill_device_client.h" |
#include "chromeos/dbus/fake_shill_ipconfig_client.h" |
#include "chromeos/dbus/fake_shill_manager_client.h" |
@@ -60,7 +59,6 @@ |
#include "chromeos/dbus/permission_broker_client.h" |
#include "chromeos/dbus/power_manager_client.h" |
#include "chromeos/dbus/power_policy_controller.h" |
-#include "chromeos/dbus/privet_daemon_manager_client.h" |
#include "chromeos/dbus/session_manager_client.h" |
#include "chromeos/dbus/shill_device_client.h" |
#include "chromeos/dbus/shill_ipconfig_client.h" |
@@ -98,7 +96,6 @@ const struct { |
{ "peer_daemon", DBusClientBundle::PEER_DAEMON }, |
{ "permission_broker", DBusClientBundle::PERMISSION_BROKER }, |
{ "power_manager", DBusClientBundle::POWER_MANAGER }, |
- { "privet_daemon", DBusClientBundle::PRIVET_DAEMON }, |
{ "session_manager", DBusClientBundle::SESSION_MANAGER }, |
{ "sms", DBusClientBundle::SMS }, |
{ "system_clock", DBusClientBundle::SYSTEM_CLOCK }, |
@@ -226,11 +223,6 @@ DBusClientBundle::DBusClientBundle(DBusClientTypeMask unstub_client_mask) |
else |
permission_broker_client_.reset(new FakePermissionBrokerClient); |
- if (!IsUsingStub(PRIVET_DAEMON)) |
- privet_daemon_manager_client_.reset(PrivetDaemonManagerClient::Create()); |
- else |
- privet_daemon_manager_client_.reset(new FakePrivetDaemonManagerClient); |
- |
if (!IsUsingStub(AP_MANAGER)) |
ap_manager_client_.reset(ApManagerClient::Create()); |
else |