ash/mash: Fix launching ash as a mus-app in chromeos.

ash/mus/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/mus/sysui_application.h"
 
 #include "ash/desktop_background/desktop_background_controller.h"
 #include "ash/host/ash_window_tree_host_init_params.h"
 #include "ash/host/ash_window_tree_host_platform.h"
 #include "ash/mus/shell_delegate_mus.h"
 #include "ash/mus/stub_context_factory.h"
 #include "ash/root_window_settings.h"
 #include "ash/shell.h"
 #include "ash/shell_init_params.h"
 #include "ash/shell_window_ids.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "mash/wm/public/interfaces/container.mojom.h"
 #include "ui/aura/env.h"
 #include "ui/base/resource/resource_bundle.h"
 #include "ui/base/ui_base_paths.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 "device/bluetooth/dbus/bluez_dbus_manager.h"
+#include "ui/events/devices/device_data_manager.h"
+#endif
+
 using views::ViewsDelegate;
 
 namespace ash {
 namespace sysui {
 
 namespace {
 
 // Tries to determine the corresponding container in mash from the ash container
 // for the widget.
 mash::wm::mojom::Container GetContainerId(aura::Window* container) {
@@ skipping 115 matching lines @@
     // installs and uses the ScreenAsh. This can be removed once ash learns to
     // talk to mus for managing displays.
     gfx::Screen::SetScreenInstance(nullptr);
 
     // Install some hook so that the WindowTreeHostMus created for widgets can
     // be hooked up correctly.
     native_widget_factory_.reset(new NativeWidgetFactory());
 
     ash::AshWindowTreeHost::SetFactory(base::Bind(&CreateWindowTreeHostMus));
     ash_delegate_ = new ShellDelegateMus;
-    message_center::MessageCenter::Initialize();
+
+    InitializeComponents();
 
     ash::ShellInitParams init_params;
     init_params.delegate = ash_delegate_;
     init_params.context_factory = new StubContextFactory;
     init_params.blocking_pool = worker_pool_.get();
     ash::Shell::CreateInstance(init_params);
     ash::Shell::GetInstance()->CreateShelf();
     ash::Shell::GetInstance()->UpdateAfterLoginStatusChange(
         ash::user::LOGGED_IN_USER);
 
@@ skipping 12 matching lines @@
       SkAutoLockPixels alp(bitmap);
       *bitmap.getAddr32(0, 0) = SkColorSetRGB(0, 0, 0);
     }
 #endif
     gfx::ImageSkia wallpaper = gfx::ImageSkia::CreateFrom1xBitmap(bitmap);
     ash::Shell::GetInstance()
         ->desktop_background_controller()
         ->SetWallpaperImage(wallpaper, wallpaper::WALLPAPER_LAYOUT_TILE);
   }
 
+  void InitializeComponents() {
+    message_center::MessageCenter::Initialize();
+
+#if defined(OS_CHROMEOS)
+    ui::DeviceDataManager::CreateInstance();
+    chromeos::DBusThreadManager::Initialize();
+    bluez::BluezDBusManager::Initialize(
+        chromeos::DBusThreadManager::Get()->GetSystemBus(),
+        chromeos::DBusThreadManager::Get()->IsUsingStub(
+            chromeos::DBusClientBundle::BLUETOOTH));
+    chromeos::CrasAudioHandler::InitializeForTesting();
+#endif
+  }
+
  private:
   scoped_refptr<base::SequencedWorkerPool> worker_pool_;
   scoped_ptr<views::AuraInit> aura_init_;
   ShellDelegateMus* ash_delegate_ = nullptr;
   scoped_ptr<NativeWidgetFactory> native_widget_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(AshInit);
 };
 
 SysUIApplication::SysUIApplication() {}
 
 SysUIApplication::~SysUIApplication() {}
 
 void SysUIApplication::Initialize(mojo::Shell* shell,
                                   const std::string& url,
                                   uint32_t id) {
   ash_init_.reset(new AshInit());
   ash_init_->Initialize(shell);
 }
 
 }  // namespace sysui
 }  // namespace ash