Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(337)

Unified Diff: device/bluetooth/bluetooth_socket_chromeos.cc

Issue 910433002: Fix crash on second failed connect to a paired device (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: bugfix unit tests Created 5 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: device/bluetooth/bluetooth_socket_chromeos.cc
diff --git a/device/bluetooth/bluetooth_socket_chromeos.cc b/device/bluetooth/bluetooth_socket_chromeos.cc
index b2958f2fc85a68ae9835cb478b495bcdf7dd4cb4..3026113a5cb9a1de191b98e29b04759b29129b4e 100644
--- a/device/bluetooth/bluetooth_socket_chromeos.cc
+++ b/device/bluetooth/bluetooth_socket_chromeos.cc
@@ -128,8 +128,7 @@ void BluetoothSocketChromeOS::Listen(
return;
}
- adapter_ = adapter;
- adapter_->AddObserver(this);
+ adapter->AddObserver(this);
uuid_ = uuid;
options_.reset(new BluetoothProfileManagerClient::Options());
@@ -149,7 +148,7 @@ void BluetoothSocketChromeOS::Listen(
NOTREACHED();
}
- RegisterProfile(static_cast<BluetoothAdapterChromeOS*>(adapter_.get()),
+ RegisterProfile(static_cast<BluetoothAdapterChromeOS*>(adapter.get()),
success_callback, error_callback);
}
@@ -222,10 +221,12 @@ void BluetoothSocketChromeOS::RegisterProfile(
DCHECK(!profile_);
DCHECK(adapter);
+ adapter_ = adapter;
+
// If the adapter is not present, this is a listening socket and the
// adapter isn't running yet. Report success and carry on;
// the profile will be registered when the daemon becomes available.
- if (!adapter->IsPresent()) {
+ if (!adapter_->IsPresent()) {
VLOG(1) << uuid_.canonical_value() << " on " << device_path_.value()
<< ": Delaying profile registration.";
base::MessageLoop::current()->PostTask(FROM_HERE, success_callback);
« no previous file with comments | « device/bluetooth/bluetooth_chromeos_unittest.cc ('k') | device/bluetooth/bluetooth_socket_chromeos_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698