mash: Allow a subset of D-Bus clients to be created in DBusThreadManager

ash/wm/lock_state_controller.cc

Index: ash/wm/lock_state_controller.cc
diff --git a/ash/wm/lock_state_controller.cc b/ash/wm/lock_state_controller.cc
index 53179324af2a5871818b80d7375895f21a620dfe..eb9fcfe36a4b9f7903b7dca7b3f3e53525922930 100644
--- a/ash/wm/lock_state_controller.cc
+++ b/ash/wm/lock_state_controller.cc
@@ -11,6 +11,7 @@
 #include "ash/cancel_mode.h"
 #include "ash/common/accessibility_delegate.h"
 #include "ash/common/ash_switches.h"
+#include "ash/common/dbus_thread_manager_ash.h"
 #include "ash/common/shell_delegate.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm_shell.h"
@@ -31,7 +32,7 @@
 
 #if defined(OS_CHROMEOS)
 #include "base/sys_info.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
+// #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/session_manager_client.h"
 #endif
 
@@ -492,7 +493,7 @@ void LockStateController::PreLockAnimationFinished(bool request_lock) {
         shutdown_after_lock_ ? UMA_ACCEL_LOCK_SCREEN_POWER_BUTTON
                              : UMA_ACCEL_LOCK_SCREEN_LOCK_BUTTON);
 #if defined(OS_CHROMEOS)
-    chromeos::DBusThreadManager::Get()
+    DBusThreadManagerAsh::Get()
         ->GetSessionManagerClient()
         ->RequestLockScreen();
 #endif