bluetooth: remove switch from options handler too

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

 // Copyright (c) 2012 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/ui/webui/options/chromeos/bluetooth_options_handler.h"
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
@@ skipping 16 matching lines @@
 const int kUpdateDevicePasskeyIndex = 2;
 
 }  // namespace
 
 namespace chromeos {
 
 BluetoothOptionsHandler::BluetoothOptionsHandler() {
 }
 
 BluetoothOptionsHandler::~BluetoothOptionsHandler() {
-  adapter_->RemoveObserver(this);
+  if (adapter_.get())
+    adapter_->RemoveObserver(this);
 }
 
 void BluetoothOptionsHandler::GetLocalizedValues(
     DictionaryValue* localized_strings) {
   DCHECK(localized_strings);
 
   localized_strings->SetString("bluetooth",
       l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_SECTION_TITLE_BLUETOOTH));
   localized_strings->SetString("disableBluetooth",
       l10n_util::GetStringUTF16(IDS_OPTIONS_SETTINGS_BLUETOOTH_DISABLE));
@@ skipping 57 matching lines @@
       IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECTION_FAILED_INCORRECT_PIN));
   localized_strings->SetString("bluetoothErrorTimeout",
       l10n_util::GetStringUTF16(
       IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECTION_FAILED_TIMEOUT));
   localized_strings->SetString("bluetoothErrorConnectionFailed",
       l10n_util::GetStringUTF16(
       IDS_OPTIONS_SETTINGS_BLUETOOTH_CONNECTION_FAILED));
 }
 
 void BluetoothOptionsHandler::InitializeHandler() {
-  // 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);
 
   // Show or hide the bluetooth settings and update the checkbox based
   // on the current present/powered state.
   AdapterPresentChanged(adapter_.get(), adapter_->IsPresent());
 }
 
 void BluetoothOptionsHandler::AdapterPresentChanged(BluetoothAdapter* adapter,
                                                     bool present) {
@@ skipping 166 matching lines @@
 
 void BluetoothOptionsHandler::ErrorCallback() {
   // TODO(keybuk): we don't get any form of error response from dbus::
   // yet, other than an error occurred. I'm going to fix that, then this
   // gets replaced by genuine error information from the method which we
   // can act on, rather than a debug log statement.
   DVLOG(1) << "Failed.";
 }
 
 }  // namespace chromeos