Implemented Asynchronous Initialization of BluetoothAdapter.

device/bluetooth/bluetooth_adapter_factory.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 "device/bluetooth/bluetooth_adapter_factory.h"
 
+#include <vector>
+
+#include "base/bind.h"
 #include "base/lazy_instance.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/weak_ptr.h"
 #include "device/bluetooth/bluetooth_adapter.h"
 
 #if defined(OS_CHROMEOS)
 #include "device/bluetooth/bluetooth_adapter_chromeos.h"
 #elif defined(OS_WIN)
 #include "device/bluetooth/bluetooth_adapter_win.h"
 #endif
 
 namespace {
 
+using device::BluetoothAdapter;
+using device::BluetoothAdapterFactory;
+
 // Shared default adapter instance, we don't want to keep this class around
 // if nobody is using it so use a WeakPtr and create the object when needed;
 // since Google C++ Style (and clang's static analyzer) forbids us having
 // exit-time destructors we use a leaky lazy instance for it.
 base::LazyInstance<base::WeakPtr<device::BluetoothAdapter> >::Leaky
     default_adapter = LAZY_INSTANCE_INITIALIZER;
 
+std::vector<BluetoothAdapterFactory::AdapterCallback> adapter_callbacks;

[Ami GONE FROM CHROMIUM, 2013/01/23 17:40:58]

Post-commit note:

This violates the style guide which prohibits global variables of class type. 
It also broke the Linux "sizes" test because it introduced a static initializer
to a file that previously had none.

+
+void RunAdapterCallbacks() {
+  CHECK(default_adapter.Get().get());
+  scoped_refptr<BluetoothAdapter> adapter(default_adapter.Get());
+  for (std::vector<BluetoothAdapterFactory::AdapterCallback>::const_iterator
+           iter = adapter_callbacks.begin();
+       iter != adapter_callbacks.end();
+       ++iter) {
+    iter->Run(adapter);
+  }
+  adapter_callbacks.clear();
+}
+
 }  // namespace
 
 namespace device {
 
 // static
 bool BluetoothAdapterFactory::IsBluetoothAdapterAvailable() {
 #if defined(OS_CHROMEOS)
   return true;
 #elif defined(OS_WIN)
   return true;
 #endif
   return false;
 }
 
 // static
-void BluetoothAdapterFactory::RunCallbackOnAdapterReady(
-    const BluetoothAdapter::AdapterCallback& callback) {
+void BluetoothAdapterFactory::GetAdapter(const AdapterCallback& callback) {
   if (!default_adapter.Get().get()) {
 #if defined(OS_CHROMEOS)
     chromeos::BluetoothAdapterChromeOs* new_adapter =
         new chromeos::BluetoothAdapterChromeOs;
     new_adapter->TrackDefaultAdapter();
     default_adapter.Get() = new_adapter->weak_ptr_factory_.GetWeakPtr();
 #elif defined(OS_WIN)
-    BluetoothAdapterWin* new_adapter = new BluetoothAdapterWin();
+    BluetoothAdapterWin* new_adapter = new BluetoothAdapterWin(
+        base::Bind(&RunAdapterCallbacks));
     new_adapter->TrackDefaultAdapter();
     default_adapter.Get() = new_adapter->weak_ptr_factory_.GetWeakPtr();
 #endif
   }
 
   if (default_adapter.Get()->IsInitialized()) {
     callback.Run(scoped_refptr<BluetoothAdapter>(default_adapter.Get()));
   } else {
-    default_adapter.Get()->QueueAdapterCallback(callback);
+    adapter_callbacks.push_back(callback);
   }
 }
 
 // static
-scoped_refptr<BluetoothAdapter> BluetoothAdapterFactory::GetAdapter() {
+scoped_refptr<BluetoothAdapter> BluetoothAdapterFactory::MaybeGetAdapter() {
   return scoped_refptr<BluetoothAdapter>(default_adapter.Get());
 }
 
 // static
 BluetoothAdapter* BluetoothAdapterFactory::Create(const std::string& address) {
   BluetoothAdapter* adapter = NULL;
 #if defined(OS_CHROMEOS)
   chromeos::BluetoothAdapterChromeOs* adapter_chromeos =
       new chromeos::BluetoothAdapterChromeOs;
   adapter_chromeos->FindAdapter(address);
   adapter = adapter_chromeos;
 #elif defined(OS_WIN)
-  adapter = new BluetoothAdapterWin();
+  adapter = new BluetoothAdapterWin(base::Bind(&RunAdapterCallbacks));
 #endif
   return adapter;
 }
 
 }  // namespace device