Changed DefaultAdapter to RunCallbackOnAdapterReady function.

device/bluetooth/bluetooth_adapter_devices_chromeos_unittest.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 "chromeos/dbus/mock_bluetooth_adapter_client.h"
 #include "chromeos/dbus/mock_bluetooth_device_client.h"
 #include "chromeos/dbus/mock_bluetooth_manager_client.h"
 #include "chromeos/dbus/mock_dbus_thread_manager.h"
 #include "dbus/object_path.h"
 #include "device/bluetooth/bluetooth_adapter.h"
@@ skipping 34 matching lines @@
     // a callback to obtain the adapter path.
     BluetoothManagerClient::AdapterCallback adapter_callback;
     EXPECT_CALL(*mock_manager_client_, DefaultAdapter(_))
         .WillOnce(SaveArg<0>(&adapter_callback));
 
     EXPECT_CALL(*mock_manager_client_, AddObserver(_))
         .Times(1);
     EXPECT_CALL(*mock_adapter_client_, AddObserver(_))
         .Times(1);
 
-    adapter_ = BluetoothAdapterFactory::DefaultAdapter();
-    ASSERT_TRUE(adapter_.get() != NULL);
+    BluetoothAdapterFactory::RunCallbackOnAdapterReady(
+        base::Bind(&BluetoothAdapterDevicesChromeOsTest::SetAdapter,
+                   base::Unretained(this)));
+    ASSERT_TRUE(adapter_ != NULL);
 
     // Call the adapter callback;
     // BluetoothAdapterClient::GetProperties will be called once to obtain
     // the property set.
     MockBluetoothAdapterClient::Properties adapter_properties;
     adapter_properties.address.ReplaceValue(adapter_address_);
     adapter_properties.powered.ReplaceValue(true);
 
     EXPECT_CALL(*mock_adapter_client_, GetProperties(adapter_path_))
         .WillRepeatedly(Return(&adapter_properties));
@@ skipping 22 matching lines @@
         .Times(1);
     EXPECT_CALL(*mock_adapter_client_, RemoveObserver(adapter_chromeos))
         .Times(1);
     EXPECT_CALL(*mock_manager_client_, RemoveObserver(adapter_chromeos))
         .Times(1);
 
     adapter_ = NULL;
     DBusThreadManager::Shutdown();
   }
 
+  void SetAdapter(scoped_refptr<device::BluetoothAdapter> adapter) {
+    adapter_ = adapter;
+  }
+
  protected:
   MockBluetoothManagerClient* mock_manager_client_;
   MockBluetoothAdapterClient* mock_adapter_client_;
   MockBluetoothDeviceClient* mock_device_client_;
 
   static const dbus::ObjectPath adapter_path_;
   static const std::string adapter_address_;
   scoped_refptr<BluetoothAdapter> adapter_;
 
   MockBluetoothAdapter::Observer adapter_observer_;
@@ skipping 50 matching lines @@
 
   static_cast<BluetoothAdapterClient::Observer*>(adapter_chromeos)
       ->DeviceRemoved(adapter_path_, device_path);
 
   // Verify that the device is still visible, just no longer paired.
   EXPECT_TRUE(device->IsVisible());
   EXPECT_FALSE(device->IsPaired());
 }
 
 }  // namespace chromeos