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

ash/test/ash_test_helper.cc

Index: ash/test/ash_test_helper.cc
diff --git a/ash/test/ash_test_helper.cc b/ash/test/ash_test_helper.cc
index 936ba6f60ca267ab89bd457a6b9dc8de93b246c2..6c841cc5e759e14cb18a095fb66b5a09bb9abf05 100644
--- a/ash/test/ash_test_helper.cc
+++ b/ash/test/ash_test_helper.cc
@@ -6,6 +6,7 @@
 
 #include "ash/accelerators/accelerator_controller_delegate_aura.h"
 #include "ash/common/ash_switches.h"
+#include "ash/common/dbus_thread_manager_ash.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/test/material_design_controller_test_api.h"
 #include "ash/common/wm_shell.h"
@@ -94,13 +95,15 @@ void AshTestHelper::SetUp(bool start_session,
   // Create DBusThreadManager for testing.
   if (!chromeos::DBusThreadManager::IsInitialized()) {
     chromeos::DBusThreadManager::Initialize();
+    //JAMES leak
+    new DBusThreadManagerAsh();
     dbus_thread_manager_initialized_ = true;
   }
 
   if (!bluez::BluezDBusManager::IsInitialized()) {
     bluez::BluezDBusManager::Initialize(
         chromeos::DBusThreadManager::Get()->GetSystemBus(),
-        chromeos::DBusThreadManager::Get()->IsUsingStub(
+        chromeos::DBusThreadManager::Get()->IsUsingFake(
             chromeos::DBusClientBundle::BLUETOOTH));
     bluez_dbus_manager_initialized_ = true;
   }