Chromium Code Reviews| Index: chrome/browser/devtools/browser_list_tabcontents_provider.cc |
| diff --git a/chrome/browser/devtools/browser_list_tabcontents_provider.cc b/chrome/browser/devtools/browser_list_tabcontents_provider.cc |
| index 0d46995bdbd0b360ba8a8842db7203a5405a77c9..303dba34b1cd52e10326bb641661e12bf58e0924 100644 |
| --- a/chrome/browser/devtools/browser_list_tabcontents_provider.cc |
| +++ b/chrome/browser/devtools/browser_list_tabcontents_provider.cc |
| @@ -14,7 +14,8 @@ |
| #include "chrome/common/chrome_paths.h" |
| #include "content/public/common/url_constants.h" |
| #include "grit/browser_resources.h" |
| -#include "net/socket/tcp_listen_socket.h" |
| +#include "net/base/net_errors.h" |
| +#include "net/socket/tcp_server_socket.h" |
| #include "net/url_request/url_request_context_getter.h" |
| #include "ui/base/resource/resource_bundle.h" |
| @@ -74,16 +75,20 @@ base::FilePath BrowserListTabContentsProvider::GetDebugFrontendDir() { |
| #endif |
| } |
| -scoped_ptr<net::StreamListenSocket> |
| +scoped_ptr<net::ServerSocket> |
| BrowserListTabContentsProvider::CreateSocketForTethering( |
| - net::StreamListenSocket::Delegate* delegate, |
| std::string* name) { |
| if (!g_tethering_enabled.Get()) |
| - return scoped_ptr<net::StreamListenSocket>(); |
| + return scoped_ptr<net::ServerSocket>(); |
| if (last_tethering_port_ == kMaxTetheringPort) |
| last_tethering_port_ = kMinTetheringPort; |
| int port = ++last_tethering_port_; |
| *name = base::IntToString(port); |
| - return net::TCPListenSocket::CreateAndListen("127.0.0.1", port, delegate); |
| + scoped_ptr<net::TCPServerSocket> socket( |
| + new net::TCPServerSocket(nullptr, net::NetLog::Source())); |
| + if (socket->ListenWithAddressAndPort("127.0.0.1", port, 10) != net::OK) |
|
dgozman
2014/11/06 14:33:17
nit: make 10 a named constant.
vkuzkokov
2014/11/06 16:12:43
Done.
|
| + return scoped_ptr<net::ServerSocket>(); |
| + |
| + return socket.Pass(); |
| } |