Changed DefaultAdapter to RunCallbackOnAdapterReady function.

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/bind_helpers.h"
 #include "base/callback.h"
 #include "base/command_line.h"
@@ skipping 165 matching lines @@
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("stopBluetoothDeviceDiscovery",
       base::Bind(&BluetoothOptionsHandler::StopDiscoveryCallback,
                  base::Unretained(this)));
   web_ui()->RegisterMessageCallback("getPairedBluetoothDevices",
       base::Bind(&BluetoothOptionsHandler::GetPairedDevicesCallback,
                  base::Unretained(this)));
 }
 
 void BluetoothOptionsHandler::InitializeHandler() {
-  adapter_ = device::BluetoothAdapterFactory::DefaultAdapter();
-  DCHECK(adapter_.get());
-  adapter_->AddObserver(this);
+  device::BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+      base::Bind(&BluetoothOptionsHandler::InitializeAdapter,
+                 base::Unretained(this)));
 }
 
 void BluetoothOptionsHandler::InitializePage() {
   // Show or hide the bluetooth settings and update the checkbox based
   // on the current present/powered state.
   AdapterPresentChanged(adapter_.get(), adapter_->IsPresent());
   // Automatically start device discovery if the "Add Bluetooth Device"
   // overlay is visible.
   web_ui()->CallJavascriptFunction(
       "options.BluetoothOptions.updateDiscovery");
 }
 
+bool BluetoothOptionsHandler::InitializeAdapter(
+    scoped_refptr<device::BluetoothAdapter> adapter) {
+  adapter_ = adapter;
+  DCHECK(adapter_.get());

[bryeung, 2013/01/09 15:28:02]

This should either be a CHECK, or we should let it crash on the next line.

[youngki, 2013/01/09 19:32:24]

Done.

+  adapter_->AddObserver(this);
+  return true;
+}
+
 void BluetoothOptionsHandler::EnableChangeCallback(
     const ListValue* args) {
   bool bluetooth_enabled;
   args->GetBoolean(0, &bluetooth_enabled);
 
   adapter_->SetPowered(bluetooth_enabled,
                        base::Bind(&base::DoNothing),
                        base::Bind(&BluetoothOptionsHandler::EnableChangeError,
                                   weak_ptr_factory_.GetWeakPtr()));
 }
@@ skipping 258 matching lines @@
   DCHECK(device);
 
   base::StringValue address(device->address());
   web_ui()->CallJavascriptFunction(
       "options.BrowserOptions.removeBluetoothDevice",
       address);
 }
 
 }  // namespace options
 }  // namespace chromeos