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

Unified Diff: device/bluetooth/bluetooth_socket_win.cc

Issue 1376473003: Notify NQE of TCP RTT values (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Reorder initialization in constructor Created 4 years, 8 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 | « device/bluetooth/bluetooth_socket_net.cc ('k') | extensions/browser/api/cast_channel/cast_socket.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: device/bluetooth/bluetooth_socket_win.cc
diff --git a/device/bluetooth/bluetooth_socket_win.cc b/device/bluetooth/bluetooth_socket_win.cc
index b2e9b24040da0728ce4aa7d78735bb4a0bf05c92..f6a5eeb6ac6308aa6bf7c5103dc34c7ce43197e0 100644
--- a/device/bluetooth/bluetooth_socket_win.cc
+++ b/device/bluetooth/bluetooth_socket_win.cc
@@ -194,7 +194,7 @@ void BluetoothSocketWin::DoConnect(
}
std::unique_ptr<net::TCPSocket> scoped_socket(
- new net::TCPSocket(NULL, net::NetLog::Source()));
+ new net::TCPSocket(NULL, NULL, net::NetLog::Source()));
net::EnsureWinsockInit();
SOCKET socket_fd = socket(AF_BTH, SOCK_STREAM, BTHPROTO_RFCOMM);
SOCKADDR_BTH sa;
@@ -261,7 +261,7 @@ void BluetoothSocketWin::DoListen(
// TCPSocket methods that involve address could not be called. So bind()
// is called on |socket_fd| directly.
std::unique_ptr<net::TCPSocket> scoped_socket(
- new net::TCPSocket(NULL, net::NetLog::Source()));
+ new net::TCPSocket(NULL, NULL, net::NetLog::Source()));
scoped_socket->AdoptListenSocket(socket_fd);
SOCKADDR_BTH sa;
« no previous file with comments | « device/bluetooth/bluetooth_socket_net.cc ('k') | extensions/browser/api/cast_channel/cast_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698