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

Unified Diff: chrome/browser/devtools/device/usb/android_usb_socket.cc

Issue 502293002: Remove implicit conversions from scoped_refptr to T* in chrome/browser/devtools/ (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Created 6 years, 4 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: chrome/browser/devtools/device/usb/android_usb_socket.cc
diff --git a/chrome/browser/devtools/device/usb/android_usb_socket.cc b/chrome/browser/devtools/device/usb/android_usb_socket.cc
index 6104a019b13ec0ce0a4774e2a05c6b98ad0a3ae0..f9fa0865c58502e1933e657478a7032cc87a6571 100644
--- a/chrome/browser/devtools/device/usb/android_usb_socket.cc
+++ b/chrome/browser/devtools/device/usb/android_usb_socket.cc
@@ -45,7 +45,7 @@ AndroidUsbSocket::~AndroidUsbSocket() {
}
void AndroidUsbSocket::HandleIncoming(scoped_refptr<AdbMessage> message) {
- if (!device_)
+ if (!device_.get())
return;
CHECK_EQ(message->arg1, local_id_);
@@ -116,7 +116,7 @@ int AndroidUsbSocket::Read(net::IOBuffer* buffer,
int length,
const net::CompletionCallback& callback) {
if (!is_connected_)
- return device_ ? net::ERR_SOCKET_NOT_CONNECTED : 0;
+ return device_.get() ? net::ERR_SOCKET_NOT_CONNECTED : 0;
if (read_buffer_.empty()) {
read_requests_.push_back(IORequest(buffer, length, callback));
@@ -159,7 +159,7 @@ int AndroidUsbSocket::SetSendBufferSize(int32 size) {
int AndroidUsbSocket::Connect(const net::CompletionCallback& callback) {
DCHECK(CalledOnValidThread());
- if (!device_)
+ if (!device_.get())
return net::ERR_FAILED;
connect_callback_ = callback;
device_->Send(AdbMessage::kCommandOPEN, local_id_, 0, command_);
@@ -167,7 +167,7 @@ int AndroidUsbSocket::Connect(const net::CompletionCallback& callback) {
}
void AndroidUsbSocket::Disconnect() {
- if (!device_)
+ if (!device_.get())
return;
device_->Send(AdbMessage::kCommandCLSE, local_id_, remote_id_, "");
Terminated(false);
« no previous file with comments | « chrome/browser/devtools/device/usb/android_usb_device.cc ('k') | chrome/browser/devtools/device/usb/usb_device_provider.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698