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

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

Index: chrome/browser/chromeos/chrome_browser_main_chromeos.cc
diff --git a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
index f7c6ecaf43d281affc133966bc7727fee0eea19f..10f39c6a6281a7c76ece7f60ae445ac1e5357993 100644
--- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
+++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
@@ -101,6 +101,7 @@
 #include "chromeos/cryptohome/cryptohome_parameters.h"
 #include "chromeos/cryptohome/homedir_methods.h"
 #include "chromeos/cryptohome/system_salt_getter.h"
+#include "chromeos/dbus/dbus_client_bundle.h"
 #include "chromeos/dbus/dbus_thread_manager.h"
 #include "chromeos/dbus/power_policy_controller.h"
 #include "chromeos/dbus/services/console_service_provider.h"
@@ -198,13 +199,19 @@ namespace internal {
 class DBusServices {
  public:
   explicit DBusServices(const content::MainFunctionParams& parameters) {
+    DBusClientTypeMask dbus_clients = DBusClientBundle::ALL_CLIENTS;
+    // Under mustash the ash process handles SMS D-Bus services.
+    if (chrome::IsRunningInMash()) {
+      dbus_clients &= ~DBusClientBundle::GSM_SMS;
+      dbus_clients &= ~DBusClientBundle::SMS;
+    }
     // Initialize DBusThreadManager for the browser. This must be done after
     // the main message loop is started, as it uses the message loop.
-    DBusThreadManager::Initialize();
+    DBusThreadManager::Initialize(dbus_clients);
 
     bluez::BluezDBusManager::Initialize(
         DBusThreadManager::Get()->GetSystemBus(),
-        chromeos::DBusThreadManager::Get()->IsUsingStub(
+        chromeos::DBusThreadManager::Get()->IsUsingFake(
             chromeos::DBusClientBundle::BLUETOOTH));
 
     PowerPolicyController::Initialize(