Changed DefaultAdapter to RunCallbackOnAdapterReady function.

chrome/browser/extensions/api/bluetooth/bluetooth_event_router.h

 // 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.
 
 #ifndef CHROME_BROWSER_EXTENSIONS_API_BLUETOOTH_BLUETOOTH_EVENT_ROUTER_H_
 #define CHROME_BROWSER_EXTENSIONS_API_BLUETOOTH_BLUETOOTH_EVENT_ROUTER_H_
 
 #include <map>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_vector.h"
 #include "chrome/common/extensions/api/bluetooth.h"
 #include "device/bluetooth/bluetooth_adapter.h"
+#include "device/bluetooth/bluetooth_adapter_factory.h"
 #include "device/bluetooth/bluetooth_socket.h"
 
 class Profile;
 
 namespace extensions {
 
 class ExtensionBluetoothEventRouter
     : public device::BluetoothAdapter::Observer {
  public:
   explicit ExtensionBluetoothEventRouter(Profile* profile);
   virtual ~ExtensionBluetoothEventRouter();
 
-  // GetAdapter will return NULL if the bluetooth adapter is not
-  // supported in the current platform.
-  scoped_refptr<device::BluetoothAdapter> GetAdapter();
+  // |callback| will not be run if the bluetooth is not supported in the current

[bryeung, 2013/01/08 22:24:27]

This seems like a frustrating API.  Can we have the |callback| be run with NULL
if Bluetooth is not supported on the platform or there is an error getting the
adapter?

[youngki, 2013/01/09 15:12:03]

Done.

+  // platform.
+  void RunCallbackOnAdapterReady(
+      const device::BluetoothAdapterFactory::AdapterCallback& callback);
 
   // Called when a bluetooth event listener is added.
   void OnListenerAdded();
 
   // Called when a bluetooth event listener is removed.
   void OnListenerRemoved();
 
   // Register the BluetoothSocket |socket| for use by the extensions system.
   // This class will hold onto the socket for its lifetime, or until
   // ReleaseSocket is called for the socket.  Returns an id for the socket.
@@ skipping 28 matching lines @@
                                          bool discovering) OVERRIDE;
   virtual void DeviceAdded(device::BluetoothAdapter* adapter,
                            device::BluetoothDevice* device) OVERRIDE;
 
   // Exposed for testing.
   void SetAdapterForTest(device::BluetoothAdapter* adapter) {
     adapter_ = adapter;
   }
  private:
   void InitializeAdapterIfNeeded();
+  bool InitializeAdapter(scoped_refptr<device::BluetoothAdapter> adapter);
   void MaybeReleaseAdapter();
   void DispatchAdapterStateEvent();
 
   bool send_discovery_events_;
   bool responsible_for_discovery_;
 
   Profile* profile_;
   scoped_refptr<device::BluetoothAdapter> adapter_;
 
   int num_event_listeners_;
 
   // The next id to use for referring to a BluetoothSocket.  We avoid using
   // the fd of the socket because we don't want to leak that information to
   // the extension javascript.
   int next_socket_id_;
 
   typedef std::map<int, scoped_refptr<device::BluetoothSocket> > SocketMap;
   SocketMap socket_map_;
 
   typedef ScopedVector<extensions::api::bluetooth::Device>
       DeviceList;
   DeviceList discovered_devices_;
 
   DISALLOW_COPY_AND_ASSIGN(ExtensionBluetoothEventRouter);
 };
 
 }  // namespace extensions
 
 #endif  // CHROME_BROWSER_EXTENSIONS_API_BLUETOOTH_BLUETOOTH_EVENT_ROUTER_H_