Merge from Chromium at DEPS revision r205460
This commit was generated by merge_to_master.py.
Change-Id: I4a744a5e426bd3bb378d887cfa56fe054742a540
diff --git a/device/bluetooth/bluetooth_adapter_factory.cc b/device/bluetooth/bluetooth_adapter_factory.cc
index 5959ca4..0b9d160 100644
--- a/device/bluetooth/bluetooth_adapter_factory.cc
+++ b/device/bluetooth/bluetooth_adapter_factory.cc
@@ -44,7 +44,7 @@
void RunAdapterCallbacks() {
CHECK(default_adapter.Get().get());
- scoped_refptr<BluetoothAdapter> adapter(default_adapter.Get());
+ scoped_refptr<BluetoothAdapter> adapter(default_adapter.Get().get());
for (std::vector<BluetoothAdapterFactory::AdapterCallback>::const_iterator
iter = adapter_callbacks.Get().begin();
iter != adapter_callbacks.Get().end();
@@ -90,7 +90,7 @@
}
if (default_adapter.Get()->IsInitialized()) {
- callback.Run(scoped_refptr<BluetoothAdapter>(default_adapter.Get()));
+ callback.Run(scoped_refptr<BluetoothAdapter>(default_adapter.Get().get()));
} else {
adapter_callbacks.Get().push_back(callback);
}
@@ -98,7 +98,7 @@
// static
scoped_refptr<BluetoothAdapter> BluetoothAdapterFactory::MaybeGetAdapter() {
- return scoped_refptr<BluetoothAdapter>(default_adapter.Get());
+ return scoped_refptr<BluetoothAdapter>(default_adapter.Get().get());
}
} // namespace device