| Index: chromeos/dbus/dbus_client_bundle.cc
|
| diff --git a/chromeos/dbus/dbus_client_bundle.cc b/chromeos/dbus/dbus_client_bundle.cc
|
| index 73fd8863ed3f6ea3df00aacb4f6b851ee3d988fd..28347a0f717dde8241819b9e71cb657422c5a407 100644
|
| --- a/chromeos/dbus/dbus_client_bundle.cc
|
| +++ b/chromeos/dbus/dbus_client_bundle.cc
|
| @@ -33,7 +33,6 @@
|
| #include "chromeos/dbus/fake_nfc_manager_client.h"
|
| #include "chromeos/dbus/fake_nfc_record_client.h"
|
| #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_shill_device_client.h"
|
| #include "chromeos/dbus/fake_shill_ipconfig_client.h"
|
| @@ -53,7 +52,6 @@
|
| #include "chromeos/dbus/nfc_manager_client.h"
|
| #include "chromeos/dbus/nfc_record_client.h"
|
| #include "chromeos/dbus/nfc_tag_client.h"
|
| -#include "chromeos/dbus/peer_daemon_manager_client.h"
|
| #include "chromeos/dbus/permission_broker_client.h"
|
| #include "chromeos/dbus/power_manager_client.h"
|
| #include "chromeos/dbus/power_policy_controller.h"
|
| @@ -90,7 +88,6 @@ const struct {
|
| { "introspectable", DBusClientBundle::INTROSPECTABLE },
|
| { "modem_messaging", DBusClientBundle::MODEM_MESSAGING },
|
| { "nfc", DBusClientBundle::NFC },
|
| - { "peer_daemon", DBusClientBundle::PEER_DAEMON },
|
| { "permission_broker", DBusClientBundle::PERMISSION_BROKER },
|
| { "power_manager", DBusClientBundle::POWER_MANAGER },
|
| { "session_manager", DBusClientBundle::SESSION_MANAGER },
|
| @@ -210,11 +207,6 @@ DBusClientBundle::DBusClientBundle(DBusClientTypeMask unstub_client_mask)
|
| nfc_record_client_.reset(new FakeNfcRecordClient);
|
| }
|
|
|
| - if (!IsUsingStub(PEER_DAEMON))
|
| - peer_daemon_manager_client_.reset(PeerDaemonManagerClient::Create());
|
| - else
|
| - peer_daemon_manager_client_.reset(new FakePeerDaemonManagerClient);
|
| -
|
| if (!IsUsingStub(PERMISSION_BROKER))
|
| permission_broker_client_.reset(PermissionBrokerClient::Create());
|
| else
|
|
|