Add Bluez initialize call to startup for app_shell.

extensions/shell/browser/shell_browser_main_parts.cc

Index: extensions/shell/browser/shell_browser_main_parts.cc
diff --git a/extensions/shell/browser/shell_browser_main_parts.cc b/extensions/shell/browser/shell_browser_main_parts.cc
index df6dc980915b184d35f36590541017e05e04bae1..fe37781ebe4c3b255a1fbe3703cdaa81b685b5ae 100644
--- a/extensions/shell/browser/shell_browser_main_parts.cc
+++ b/extensions/shell/browser/shell_browser_main_parts.cc
@@ -18,6 +18,7 @@
 #include "content/public/browser/context_factory.h"
 #include "content/public/common/result_codes.h"
 #include "content/shell/browser/shell_devtools_manager_delegate.h"
+#include "device/bluetooth/bluetooth_adapter_factory.h"

[James Cook, 2016/02/11 23:17:59]

Put this in the OS_CHROMEOS block below.

[drustsmith, 2016/02/11 23:39:29]

Done.

 #include "extensions/browser/app_window/app_window_client.h"
 #include "extensions/browser/browser_context_keyed_service_factories.h"
 #include "extensions/browser/extension_system.h"
@@ -54,6 +55,10 @@
 #include "extensions/shell/browser/shell_network_controller_chromeos.h"
 #endif
 
+#if defined(OS_CHROMEOS)
+#include "device/bluetooth/dbus/bluez_dbus_manager.h"

[James Cook, 2016/02/11 23:17:59]

Put this in the OS_CHROMEOS block above.

[drustsmith, 2016/02/11 23:39:29]

Done.

+#endif
+
 #if defined(OS_MACOSX)
 #include "extensions/shell/browser/shell_browser_main_parts_mac.h"
 #endif
@@ -113,6 +118,10 @@ void ShellBrowserMainParts::PostMainMessageLoopStart() {
     network_controller_->SetCellularAllowRoaming(true);
   }
 
+  bluez::BluezDBusManager::Initialize(

[James Cook, 2016/02/11 23:17:58]

It probably doesn't matter, but since the other CL does this initialization
before NetworkHandler::Initialize(), please move this up above to match.

[drustsmith, 2016/02/11 23:39:29]

Done.

+      chromeos::DBusThreadManager::Get()->GetSystemBus(),
+      chromeos::DBusThreadManager::Get()->IsUsingStub(
+          chromeos::DBusClientBundle::BLUETOOTH));
 #else
   // Non-Chrome OS platforms are for developer convenience, so use a test IME.
   ui::InitializeInputMethodForTesting();
@@ -267,6 +276,8 @@ void ShellBrowserMainParts::PostDestroyThreads() {
   network_controller_.reset();
   chromeos::NetworkHandler::Shutdown();
   chromeos::disks::DiskMountManager::Shutdown();
+  device::BluetoothAdapterFactory::Shutdown();
+  bluez::BluezDBusManager::Shutdown();
   chromeos::DBusThreadManager::Shutdown();
 #endif
 }