| Index: chromeos/dbus/dbus_client_bundle.cc
|
| diff --git a/chromeos/dbus/dbus_client_bundle.cc b/chromeos/dbus/dbus_client_bundle.cc
|
| index a9bc4a09feae0f2a98ca1f183dc8d2e381f596c0..4696e1b5eee331e9d43c0bd8a119a0fe23fb97ed 100644
|
| --- a/chromeos/dbus/dbus_client_bundle.cc
|
| +++ b/chromeos/dbus/dbus_client_bundle.cc
|
| @@ -16,11 +16,13 @@
|
| #include "chromeos/dbus/cras_audio_client.h"
|
| #include "chromeos/dbus/cros_disks_client.h"
|
| #include "chromeos/dbus/cryptohome_client.h"
|
| +#include "chromeos/dbus/cups_client.h"
|
| #include "chromeos/dbus/debug_daemon_client.h"
|
| #include "chromeos/dbus/easy_unlock_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"
|
| +#include "chromeos/dbus/fake_cups_client.h"
|
| #include "chromeos/dbus/fake_debug_daemon_client.h"
|
| #include "chromeos/dbus/fake_easy_unlock_client.h"
|
| #include "chromeos/dbus/fake_gsm_sms_client.h"
|
| @@ -66,6 +68,7 @@ const struct {
|
| { "bluetooth", DBusClientBundle::BLUETOOTH },
|
| { "cras", DBusClientBundle::CRAS },
|
| { "cros_disks", DBusClientBundle::CROS_DISKS },
|
| + { "cups_client", DBusClientBundle::CUPS_CLIENT},
|
| { "cryptohome", DBusClientBundle::CRYPTOHOME },
|
| { "debug_daemon", DBusClientBundle::DEBUG_DAEMON },
|
| { "easy_unlock", DBusClientBundle::EASY_UNLOCK },
|
| @@ -117,6 +120,11 @@ DBusClientBundle::DBusClientBundle(DBusClientTypeMask unstub_client_mask)
|
| else
|
| cryptohome_client_.reset(new FakeCryptohomeClient);
|
|
|
| + if (!IsUsingStub(CUPS_CLIENT))
|
| + cups_client_.reset(CupsClient::Create());
|
| + else
|
| + cups_client_.reset(new FakeCupsClient);
|
| +
|
| if (!IsUsingStub(DEBUG_DAEMON))
|
| debug_daemon_client_.reset(DebugDaemonClient::Create());
|
| else
|
|
|