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

Unified Diff: chrome/browser/devtools/browser_list_tabcontents_provider.cc

Issue 680943002: [DevTools] Migrate DevToolsHttpHandlerDelegate::CreateSocketForTethering to StreamSocket (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebased Created 6 years, 1 month 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/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..06fcd3a30fe8d4db392282d588bd9f37335a3c98 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"
@@ -23,6 +24,8 @@ namespace {
const int kMinTetheringPort = 9333;
const int kMaxTetheringPort = 9444;
+const int kBackLog = 10;
+
base::LazyInstance<bool>::Leaky g_tethering_enabled = LAZY_INSTANCE_INITIALIZER;
}
@@ -74,16 +77,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, kBackLog) != net::OK)
+ return scoped_ptr<net::ServerSocket>();
+
+ return socket.Pass();
}
« no previous file with comments | « chrome/browser/devtools/browser_list_tabcontents_provider.h ('k') | chromecast/browser/devtools/cast_dev_tools_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698