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

ash/sysui/sysui_application.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "ash/sysui/sysui_application.h"
 
 #include <map>
 #include <set>
 #include <string>
 #include <vector>
 
+#include "ash/common/dbus_thread_manager_ash.h"
 #include "ash/common/login_status.h"
 #include "ash/common/material_design/material_design_controller.h"
 #include "ash/common/shell_window_ids.h"
 #include "ash/common/wm_shell.h"
 #include "ash/display/display_manager.h"
 #include "ash/host/ash_window_tree_host_init_params.h"
 #include "ash/host/ash_window_tree_host_platform.h"
 #include "ash/public/interfaces/ash_window_type.mojom.h"
 #include "ash/public/interfaces/container.mojom.h"
 #include "ash/root_window_settings.h"
@@ skipping 19 matching lines @@
 #include "ui/display/screen.h"
 #include "ui/message_center/message_center.h"
 #include "ui/platform_window/stub/stub_window.h"
 #include "ui/views/mus/aura_init.h"
 #include "ui/views/mus/native_widget_mus.h"
 #include "ui/views/mus/window_manager_connection.h"
 #include "ui/views/views_delegate.h"
 
 #if defined(OS_CHROMEOS)
 #include "chromeos/audio/cras_audio_handler.h"
-#include "chromeos/dbus/dbus_thread_manager.h"
+// #include "chromeos/dbus/dbus_thread_manager.h"
 #include "device/bluetooth/dbus/bluez_dbus_manager.h"
 #endif
 
 using views::ViewsDelegate;
 
 namespace ash {
 namespace sysui {
 
 namespace {
 
@@ skipping 222 matching lines @@
                              ui::SCALE_FACTOR_200P);
     }
   }
 
   void InitializeComponents() {
     message_center::MessageCenter::Initialize();
 
 #if defined(OS_CHROMEOS)
     chromeos::DBusThreadManager::Initialize();
     bluez::BluezDBusManager::Initialize(
-        chromeos::DBusThreadManager::Get()->GetSystemBus(),
-        chromeos::DBusThreadManager::Get()->IsUsingStub(
+        DBusThreadManagerAsh::Get()->GetSystemBus(),
+        DBusThreadManagerAsh::Get()->IsUsingStub(
             chromeos::DBusClientBundle::BLUETOOTH));
     chromeos::CrasAudioHandler::InitializeForTesting();
 #endif
   }
 
  private:
   scoped_refptr<base::SequencedWorkerPool> worker_pool_;
   std::unique_ptr<views::AuraInit> aura_init_;
   ShellDelegateMus* ash_delegate_ = nullptr;
   std::unique_ptr<NativeWidgetFactory> native_widget_factory_;
@@ skipping 24 matching lines @@
 void SysUIApplication::Create(const ::shell::Identity& remote_identity,
                               mojom::WallpaperControllerRequest request) {
   mojom::WallpaperController* wallpaper_controller =
       static_cast<WallpaperDelegateMus*>(WmShell::Get()->wallpaper_delegate());
   wallpaper_controller_bindings_.AddBinding(wallpaper_controller,
                                             std::move(request));
 }
 
 }  // namespace sysui
 }  // namespace ash