Chrome OS: Attach bluetooth UI to device discovery API

chrome/browser/chromeos/dbus/dbus_thread_manager.cc

Index: chrome/browser/chromeos/dbus/dbus_thread_manager.cc
diff --git a/chrome/browser/chromeos/dbus/dbus_thread_manager.cc b/chrome/browser/chromeos/dbus/dbus_thread_manager.cc
index 30486c9e6046b88eb9be6e52f1fa40f494a5dca9..1e630417dd62f2b046a37864df35fc225ee45db0 100644
--- a/chrome/browser/chromeos/dbus/dbus_thread_manager.cc
+++ b/chrome/browser/chromeos/dbus/dbus_thread_manager.cc
@@ -6,6 +6,8 @@
 
 #include "base/command_line.h"
 #include "base/threading/thread.h"
+#include "chrome/browser/chromeos/dbus/bluetooth_adapter_client.h"
+#include "chrome/browser/chromeos/dbus/bluetooth_manager_client.h"
 #include "chrome/browser/chromeos/dbus/cros_dbus_service.h"
 #include "chrome/browser/chromeos/dbus/session_manager_client.h"
 #include "chrome/browser/chromeos/dbus/power_manager_client.h"
@@ -44,6 +46,17 @@ DBusThreadManager::DBusThreadManager() {
     sensors_source_->Init(system_bus_.get());
   }
 
+  // Create bluetooth clients if bluetooth is enabled.
+  if (command_line.HasSwitch(switches::kEnableBluetooth)) {
+    bluetooth_manager_client_.reset(BluetoothManagerClient::Create(
+        system_bus_.get()));
+    CHECK(bluetooth_manager_client_.get() != NULL);
+
+    bluetooth_adapter_client_.reset(BluetoothAdapterClient::Create(
+        system_bus_.get()));
+    CHECK(bluetooth_adapter_client_.get() != NULL);
+  }
+
   // Create the power manager client.
   power_manager_client_.reset(PowerManagerClient::Create(system_bus_.get()));
   // Create the session manager client.