chrome: bluetooth: create BluetoothManager after about:flags parsed

chrome/browser/chromeos/chrome_browser_main_chromeos.cc

 // Copyright (c) 2011 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 "chrome/browser/chromeos/chrome_browser_main_chromeos.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 125 matching lines @@
   net::NetworkChangeNotifier::SetFactory(
       new chromeos::CrosNetworkChangeNotifierFactory());
 }
 
 void ChromeBrowserMainPartsChromeos::PreMainMessageLoopRun() {
   // FILE thread is created in ChromeBrowserMainParts::PreMainMessageLoopRun().
   ChromeBrowserMainPartsLinux::PreMainMessageLoopRun();
   // Get the statistics provider instance here to start loading statistcs
   // on the background FILE thread.
   chromeos::system::StatisticsProvider::GetInstance();
+
+  // Initialize the Chrome OS bluetooth subsystem.
+  // We defer this to PreMainMessageLoopRun because we don't want to check the
+  // parsed command line until after about_flags::ConvertFlagsToSwitches has
+  // been called.
+  // TODO(vlaviano): Move this back to PostMainMessageLoopStart when we remove
+  // the --enable-bluetooth flag.
+  if (parsed_command_line().HasSwitch(switches::kEnableBluetooth)) {
+    chromeos::BluetoothManager::Initialize();
+  }
 }
 
 void ChromeBrowserMainPartsChromeos::PostMainMessageLoopStart() {
   ChromeBrowserMainPartsPosix::PostMainMessageLoopStart();
   MessageLoopForUI* message_loop = MessageLoopForUI::current();
   message_loop->AddObserver(g_message_loop_observer.Pointer());
 
   // Initialize DBusThreadManager for the browser. This must be done after
   // the main message loop is started, as it uses the message loop.
   chromeos::DBusThreadManager::Initialize();
 
   // Initialize the brightness observer so that we'll display an onscreen
   // indication of brightness changes during login.
   brightness_observer_.reset(new chromeos::BrightnessObserver());
   chromeos::DBusThreadManager::Get()->GetPowerManagerClient()->AddObserver(
       brightness_observer_.get());
   // Initialize the session manager observer so that we'll take actions
   // per signals sent from the session manager.
   session_manager_observer_.reset(new chromeos::SessionManagerObserver);
   chromeos::DBusThreadManager::Get()->GetSessionManagerClient()->
       AddObserver(session_manager_observer_.get());
 
-  // Initialize the Chrome OS bluetooth subsystem
-  if (parsed_command_line().HasSwitch(switches::kEnableBluetooth)) {
-    chromeos::BluetoothManager::Initialize();
-  }
-
   // Initialize the network change notifier for Chrome OS. The network
   // change notifier starts to monitor changes from the power manager and
   // the network manager.
   chromeos::CrosNetworkChangeNotifierFactory::GetInstance()->Init();
 
   // For http://crosbug.com/p/5795 and http://crosbug.com/p/6245.
   // Enable Num Lock on X start up.
   if (chromeos::system::runtime_environment::IsRunningOnChromeOS()) {
     chromeos::input_method::InputMethodManager::GetInstance()->GetXKeyboard()->
         SetNumLockEnabled(true);
   }
 }