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

Unified Diff: components/pairing/bluetooth_host_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 | « components/pairing/bluetooth_controller_pairing_controller.cc ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: components/pairing/bluetooth_host_pairing_controller.cc
diff --git a/components/pairing/bluetooth_host_pairing_controller.cc b/components/pairing/bluetooth_host_pairing_controller.cc
index a22dfc32952b0fddef88900f12d4b8e89daf52c2..53a6187eb072ec6058607cc09d48ab2570cd7920 100644
--- a/components/pairing/bluetooth_host_pairing_controller.cc
+++ b/components/pairing/bluetooth_host_pairing_controller.cc
@@ -66,7 +66,7 @@ void BluetoothHostPairingController::SendHostStatus() {
void BluetoothHostPairingController::AbortWithError(
int code,
const std::string& message) {
- if (controller_socket_) {
+ if (controller_socket_.get()) {
pairing_api::Error error;
error.set_api_version(kPairingAPIVersion);
@@ -88,12 +88,12 @@ void BluetoothHostPairingController::AbortWithError(
}
void BluetoothHostPairingController::Reset() {
- if (controller_socket_) {
+ if (controller_socket_.get()) {
controller_socket_->Close();
controller_socket_ = NULL;
}
- if (service_socket_) {
+ if (service_socket_.get()) {
service_socket_->Close();
service_socket_ = NULL;
}
@@ -103,7 +103,7 @@ void BluetoothHostPairingController::Reset() {
void BluetoothHostPairingController::OnGetAdapter(
scoped_refptr<device::BluetoothAdapter> adapter) {
DCHECK(thread_checker_.CalledOnValidThread());
- DCHECK(!adapter_);
+ DCHECK(!adapter_.get());
adapter_ = adapter;
// TODO(zork): Make the device name prettier. (http://crbug.com/405774)
« no previous file with comments | « components/pairing/bluetooth_controller_pairing_controller.cc ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698