Index: device/bluetooth/bluetooth_socket_chromeos.cc |
diff --git a/device/bluetooth/bluetooth_socket_chromeos.cc b/device/bluetooth/bluetooth_socket_chromeos.cc |
index c193c1f1d906f83972d880403205d6d823015969..1b78851f93f28300c6582538d4b3a7098e0e7808 100644 |
--- a/device/bluetooth/bluetooth_socket_chromeos.cc |
+++ b/device/bluetooth/bluetooth_socket_chromeos.cc |
@@ -85,7 +85,7 @@ BluetoothSocketChromeOS::~BluetoothSocketChromeOS() { |
if (adapter_.get()) { |
adapter_->RemoveObserver(this); |
- adapter_ = NULL; |
+ adapter_ = nullptr; |
} |
} |
@@ -167,7 +167,7 @@ void BluetoothSocketChromeOS::Close() { |
// DBusThreadManager during shutdown if that callback executes too late. |
if (adapter_.get()) { |
adapter_->RemoveObserver(this); |
- adapter_ = NULL; |
+ adapter_ = nullptr; |
} |
if (!device_path_.value().empty()) { |
@@ -181,7 +181,7 @@ void BluetoothSocketChromeOS::Disconnect(const base::Closure& callback) { |
DCHECK(ui_task_runner()->RunsTasksOnCurrentThread()); |
if (profile_) |
- UnregisterProfile(); |
+ UnregisterProfile(); |
if (!device_path_.value().empty()) { |
BluetoothSocketNet::Disconnect(callback); |
@@ -522,7 +522,7 @@ void BluetoothSocketChromeOS::OnNewConnection( |
accept_request_->error_callback.Run(kAcceptFailed); |
} |
- accept_request_.reset(NULL); |
+ accept_request_.reset(nullptr); |
connection_request_queue_.pop(); |
callback.Run(status); |
@@ -534,7 +534,7 @@ void BluetoothSocketChromeOS::DoCloseListening() { |
if (accept_request_) { |
accept_request_->error_callback.Run( |
net::ErrorToString(net::ERR_CONNECTION_CLOSED)); |
- accept_request_.reset(NULL); |
+ accept_request_.reset(nullptr); |
} |
while (connection_request_queue_.size() > 0) { |
@@ -556,3 +556,4 @@ void BluetoothSocketChromeOS::UnregisterProfile() { |
} |
} // namespace chromeos |
+ |