Revert 126809 - bluetooth: remove command-line flag, enabling by default

chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc

Index: chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc
===================================================================
--- chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc	(revision 126830)
+++ chrome/browser/ui/webui/options/chromeos/bluetooth_options_handler.cc	(working copy)
@@ -12,6 +12,7 @@
 #include "chrome/browser/chromeos/bluetooth/bluetooth_device.h"
 #include "chrome/browser/chromeos/system/runtime_environment.h"
 #include "chrome/browser/ui/webui/options/chromeos/system_settings_provider.h"
+#include "chrome/common/chrome_switches.h"
 #include "content/public/browser/web_ui.h"
 #include "grit/chromium_strings.h"
 #include "grit/generated_resources.h"
@@ -34,6 +35,11 @@
 }
 
 BluetoothOptionsHandler::~BluetoothOptionsHandler() {
+  if (!CommandLine::ForCurrentProcess()
+      ->HasSwitch(switches::kEnableBluetooth)) {
+    return;
+  }
+
   adapter_->RemoveObserver(this);
 }
 
@@ -112,6 +118,13 @@
 }
 
 void BluetoothOptionsHandler::Initialize() {
+  // Bluetooth support is a work in progress.  Supress the feature unless
+  // explicitly enabled via a command line flag.
+  if (!CommandLine::ForCurrentProcess()
+      ->HasSwitch(switches::kEnableBluetooth)) {
+    return;
+  }
+
   adapter_.reset(BluetoothAdapter::CreateDefaultAdapter());
   adapter_->AddObserver(this);