Index: chrome/browser/devtools/device/adb/adb_client_socket.cc |
diff --git a/chrome/browser/devtools/device/adb/adb_client_socket.cc b/chrome/browser/devtools/device/adb/adb_client_socket.cc |
index e65375bee312bb54f20fc9aa2c1c7c9ff2c665d1..07c2089d6bb05bc464c5d32d1f389f48a8422edd 100644 |
--- a/chrome/browser/devtools/device/adb/adb_client_socket.cc |
+++ b/chrome/browser/devtools/device/adb/adb_client_socket.cc |
@@ -181,7 +181,7 @@ void AdbClientSocket::Connect(const net::CompletionCallback& callback) { |
net::AddressList address_list = |
net::AddressList::CreateFromIPAddress(ip_number, port_); |
- socket_.reset(new net::TCPClientSocket(address_list, NULL, |
+ socket_.reset(new net::TCPClientSocket(address_list, NULL, NULL, |
bengr
2016/02/08 18:51:14
There aren't a lot of uses of NULL in this file so
tbansal1
2016/02/08 21:33:26
This CL is already huge :(. So, I would prefer not
bengr
2016/02/08 23:42:06
Acknowledged.
|
net::NetLog::Source())); |
bengr
2016/02/08 18:51:14
Also, /* inline comments */ would be helpful next
tbansal1
2016/02/08 21:33:26
I think inline comments are discouraged in Chromiu
bengr
2016/02/08 23:42:06
I've seen it both ways in Chromium, but I'll defer
tbansal1
2016/02/09 17:11:22
Acknowledged.
|
int result = socket_->Connect(callback); |
if (result != net::ERR_IO_PENDING) |