| 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 c36221efbd8b2196454fdc5664605324f5ecdab9..ea867747041931966a5d27ee2d59336e274bfb13 100644
|
| --- a/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| +++ b/chrome/browser/chromeos/chrome_browser_main_chromeos.cc
|
| @@ -118,6 +118,7 @@
|
| #include "content/public/browser/notification_service.h"
|
| #include "content/public/common/main_function_params.h"
|
| #include "device/bluetooth/bluetooth_adapter_factory.h"
|
| +#include "device/bluetooth/dbus/bluez_dbus_manager.h"
|
| #include "media/audio/sounds/sounds_manager.h"
|
| #include "net/base/network_change_notifier.h"
|
| #include "net/socket/ssl_server_socket.h"
|
| @@ -168,6 +169,12 @@ class DBusServices {
|
| // Initialize DBusThreadManager for the browser. This must be done after
|
| // the main message loop is started, as it uses the message loop.
|
| DBusThreadManager::Initialize();
|
| +
|
| + bluez::BluezDBusManager::Initialize(
|
| + DBusThreadManager::Get()->GetSystemBus(),
|
| + chromeos::DBusThreadManager::Get()->IsUsingStub(
|
| + chromeos::DBusClientBundle::BLUETOOTH));
|
| +
|
| PowerPolicyController::Initialize(
|
| DBusThreadManager::Get()->GetPowerManagerClient());
|
|
|
| @@ -234,6 +241,7 @@ class DBusServices {
|
| PowerDataCollector::Shutdown();
|
| PowerPolicyController::Shutdown();
|
| device::BluetoothAdapterFactory::Shutdown();
|
| + bluez::BluezDBusManager::Shutdown();
|
|
|
| // NOTE: This must only be called if Initialize() was called.
|
| DBusThreadManager::Shutdown();
|
|
|