| Index: chromeos/dbus/dbus_thread_manager.cc
|
| diff --git a/chromeos/dbus/dbus_thread_manager.cc b/chromeos/dbus/dbus_thread_manager.cc
|
| index 13e9e73c18cf46a5e1d93fca96b40fbe33130658..62c20ffaba5c09f891ebe416f7fa9dcb62befa7a 100644
|
| --- a/chromeos/dbus/dbus_thread_manager.cc
|
| +++ b/chromeos/dbus/dbus_thread_manager.cc
|
| @@ -32,7 +32,6 @@
|
| #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/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"
|
| @@ -217,10 +216,6 @@ PowerManagerClient* DBusThreadManager::GetPowerManagerClient() {
|
| return client_bundle_->power_manager_client();
|
| }
|
|
|
| -PrivetDaemonManagerClient* DBusThreadManager::GetPrivetDaemonManagerClient() {
|
| - return client_bundle_->privet_daemon_manager_client();
|
| -}
|
| -
|
| SessionManagerClient* DBusThreadManager::GetSessionManagerClient() {
|
| return client_bundle_->session_manager_client();
|
| }
|
| @@ -252,7 +247,6 @@ void DBusThreadManager::InitializeClients() {
|
| GetModemMessagingClient()->Init(GetSystemBus());
|
| GetPermissionBrokerClient()->Init(GetSystemBus());
|
| GetPeerDaemonManagerClient()->Init(GetSystemBus());
|
| - GetPrivetDaemonManagerClient()->Init(GetSystemBus());
|
| GetPowerManagerClient()->Init(GetSystemBus());
|
| GetSessionManagerClient()->Init(GetSystemBus());
|
| GetShillDeviceClient()->Init(GetSystemBus());
|
| @@ -522,12 +516,6 @@ void DBusThreadManagerSetter::SetPermissionBrokerClient(
|
| std::move(client);
|
| }
|
|
|
| -void DBusThreadManagerSetter::SetPrivetDaemonManagerClient(
|
| - std::unique_ptr<PrivetDaemonManagerClient> client) {
|
| - DBusThreadManager::Get()->client_bundle_->privet_daemon_manager_client_ =
|
| - std::move(client);
|
| -}
|
| -
|
| void DBusThreadManagerSetter::SetPowerManagerClient(
|
| std::unique_ptr<PowerManagerClient> client) {
|
| DBusThreadManager::Get()->client_bundle_->power_manager_client_ =
|
|
|