| Index: chromeos/dbus/dbus_client_bundle.cc
|
| diff --git a/chromeos/dbus/dbus_client_bundle.cc b/chromeos/dbus/dbus_client_bundle.cc
|
| index e3ab021b5bd6cf2c70342a23742411560fd72fed..73fd8863ed3f6ea3df00aacb4f6b851ee3d988fd 100644
|
| --- a/chromeos/dbus/dbus_client_bundle.cc
|
| +++ b/chromeos/dbus/dbus_client_bundle.cc
|
| @@ -12,14 +12,12 @@
|
| #include "base/strings/string_split.h"
|
| #include "base/strings/string_util.h"
|
| #include "chromeos/chromeos_switches.h"
|
| -#include "chromeos/dbus/ap_manager_client.h"
|
| #include "chromeos/dbus/arc_obb_mounter_client.h"
|
| #include "chromeos/dbus/cras_audio_client.h"
|
| #include "chromeos/dbus/cros_disks_client.h"
|
| #include "chromeos/dbus/cryptohome_client.h"
|
| #include "chromeos/dbus/debug_daemon_client.h"
|
| #include "chromeos/dbus/easy_unlock_client.h"
|
| -#include "chromeos/dbus/fake_ap_manager_client.h"
|
| #include "chromeos/dbus/fake_arc_obb_mounter_client.h"
|
| #include "chromeos/dbus/fake_cras_audio_client.h"
|
| #include "chromeos/dbus/fake_cryptohome_client.h"
|
| @@ -79,7 +77,6 @@ const struct {
|
| const char* param_name;
|
| DBusClientBundle::DBusClientType client_type;
|
| } client_type_map[] = {
|
| - { "ap", DBusClientBundle::AP_MANAGER },
|
| { "bluetooth", DBusClientBundle::BLUETOOTH },
|
| { "cras", DBusClientBundle::CRAS },
|
| { "cros_disks", DBusClientBundle::CROS_DISKS },
|
| @@ -223,11 +220,6 @@ DBusClientBundle::DBusClientBundle(DBusClientTypeMask unstub_client_mask)
|
| else
|
| permission_broker_client_.reset(new FakePermissionBrokerClient);
|
|
|
| - if (!IsUsingStub(AP_MANAGER))
|
| - ap_manager_client_.reset(ApManagerClient::Create());
|
| - else
|
| - ap_manager_client_.reset(new FakeApManagerClient);
|
| -
|
| power_manager_client_.reset(PowerManagerClient::Create(
|
| IsUsingStub(POWER_MANAGER) ? STUB_DBUS_CLIENT_IMPLEMENTATION
|
| : REAL_DBUS_CLIENT_IMPLEMENTATION));
|
|
|