Changed DefaultAdapter to RunCallbackOnAdapterReady function.

chrome/browser/extensions/api/bluetooth/bluetooth_event_router.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/extensions/api/bluetooth/bluetooth_event_router.h"
 
 #include <map>
 #include <string>
 
 #include "base/json/json_writer.h"
@@ skipping 11 matching lines @@
 #include "device/bluetooth/bluetooth_socket.h"
 
 namespace extensions {
 
 ExtensionBluetoothEventRouter::ExtensionBluetoothEventRouter(Profile* profile)
     : send_discovery_events_(false),
       responsible_for_discovery_(false),
       profile_(profile),
       adapter_(NULL),
       num_event_listeners_(0),
-      next_socket_id_(1) {
+      next_socket_id_(1),
+      ALLOW_THIS_IN_INITIALIZER_LIST(weak_ptr_factory_(this)) {
   DCHECK(profile_);
 }
 
 ExtensionBluetoothEventRouter::~ExtensionBluetoothEventRouter() {
   CHECK(socket_map_.size() == 0);
   if (adapter_) {
     adapter_->RemoveObserver(this);
     adapter_ = NULL;
   }
 }
 
-scoped_refptr<device::BluetoothAdapter>
-ExtensionBluetoothEventRouter::GetAdapter() {
-  if (adapter_)
-    return adapter_;
+bool ExtensionBluetoothEventRouter::IsBluetoothSupported() const {
+  return adapter_ ||
+         device::BluetoothAdapterFactory::IsBluetoothAdapterAvailable();
+}
 
-  return device::BluetoothAdapterFactory::DefaultAdapter();
+void ExtensionBluetoothEventRouter::RunCallbackOnAdapterReady(
+    const device::BluetoothAdapterFactory::AdapterCallback& callback) {
+  if (adapter_) {
+    callback.Run(scoped_refptr<device::BluetoothAdapter>(adapter_));
+    return;
+  }
+
+  device::BluetoothAdapterFactory::RunCallbackOnAdapterReady(callback);
 }
 
 void ExtensionBluetoothEventRouter::OnListenerAdded() {
   num_event_listeners_++;
   InitializeAdapterIfNeeded();
 }
 
 void ExtensionBluetoothEventRouter::OnListenerRemoved() {
   num_event_listeners_--;
   CHECK(num_event_listeners_ >= 0);
@@ skipping 111 matching lines @@
 
   if (!send_discovery_events_)
     return;
 
   DispatchDeviceEvent(extensions::event_names::kBluetoothOnDeviceDiscovered,
                       *extension_device);
 }
 
 void ExtensionBluetoothEventRouter::InitializeAdapterIfNeeded() {
   if (!adapter_) {
-    adapter_ = GetAdapter();
+    RunCallbackOnAdapterReady(
+        base::Bind(&ExtensionBluetoothEventRouter::InitializeAdapter,
+                   weak_ptr_factory_.GetWeakPtr()));
+  }
+}
+
+void ExtensionBluetoothEventRouter::InitializeAdapter(
+    scoped_refptr<device::BluetoothAdapter> adapter) {
+  adapter_ = adapter;
+  if (adapter_)
     adapter_->AddObserver(this);
-  }
 }
 
 void ExtensionBluetoothEventRouter::MaybeReleaseAdapter() {
   if (adapter_ && num_event_listeners_ == 0) {
     adapter_->RemoveObserver(this);
     adapter_ = NULL;
   }
 }
 
 void ExtensionBluetoothEventRouter::DispatchAdapterStateEvent() {
   api::bluetooth::AdapterState state;
   PopulateAdapterState(*adapter_, &state);
 
   scoped_ptr<ListValue> args(new ListValue());
   args->Append(state.ToValue().release());
   scoped_ptr<Event> event(new Event(
       extensions::event_names::kBluetoothOnAdapterStateChanged,
       args.Pass()));
   ExtensionSystem::Get(profile_)->event_router()->BroadcastEvent(event.Pass());
 }
 
 }  // namespace extensions