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

Unified Diff: components/pairing/bluetooth_controller_pairing_controller.cc

Issue 574513002: Remove implicit conversions from scoped_refptr to T* in components/pairing (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 3 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
« no previous file with comments | « no previous file | components/pairing/bluetooth_host_pairing_controller.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/pairing/bluetooth_controller_pairing_controller.cc
diff --git a/components/pairing/bluetooth_controller_pairing_controller.cc b/components/pairing/bluetooth_controller_pairing_controller.cc
index bb01dd712d74e6de3fe5bc6b7ee982806b82fa5c..cce1d67ee9e03c12bd88f337013bfe76b4e6449f 100644
--- a/components/pairing/bluetooth_controller_pairing_controller.cc
+++ b/components/pairing/bluetooth_controller_pairing_controller.cc
@@ -56,12 +56,12 @@ void BluetoothControllerPairingController::Reset() {
controller_device_id_.clear();
discovery_session_.reset();
- if (socket_) {
+ if (socket_.get()) {
socket_->Close();
socket_ = NULL;
}
- if (adapter_) {
+ if (adapter_.get()) {
adapter_->RemoveObserver(this);
adapter_ = NULL;
}
@@ -104,7 +104,7 @@ void BluetoothControllerPairingController::OnSetPowered() {
void BluetoothControllerPairingController::OnGetAdapter(
scoped_refptr<device::BluetoothAdapter> adapter) {
DCHECK(thread_checker_.CalledOnValidThread());
- DCHECK(!adapter_);
+ DCHECK(!adapter_.get());
adapter_ = adapter;
adapter_->AddObserver(this);
« no previous file with comments | « no previous file | components/pairing/bluetooth_host_pairing_controller.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698