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

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

Issue 497223003: Revert of Replace StreamListenSocket with StreamSocket in HttpServer. (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/remote_debugging_server.cc
diff --git a/chrome/browser/devtools/remote_debugging_server.cc b/chrome/browser/devtools/remote_debugging_server.cc
index c971a4abd4a5cfb9c601d64288306508388c4d20..211ff1a55cd80e7ac4bddb4c9146302ef21a10b7 100644
--- a/chrome/browser/devtools/remote_debugging_server.cc
+++ b/chrome/browser/devtools/remote_debugging_server.cc
@@ -9,28 +9,7 @@
#include "chrome/browser/ui/webui/devtools_ui.h"
#include "chrome/common/chrome_paths.h"
#include "content/public/browser/devtools_http_handler.h"
-#include "net/socket/tcp_server_socket.h"
-
-namespace {
-
-class TCPServerSocketFactory
- : public content::DevToolsHttpHandler::ServerSocketFactory {
- public:
- TCPServerSocketFactory(const std::string& address, int port, int backlog)
- : content::DevToolsHttpHandler::ServerSocketFactory(
- address, port, backlog) {}
-
- private:
- // content::DevToolsHttpHandler::ServerSocketFactory.
- virtual scoped_ptr<net::ServerSocket> Create() const OVERRIDE {
- return scoped_ptr<net::ServerSocket>(
- new net::TCPServerSocket(NULL, net::NetLog::Source()));
- }
-
- DISALLOW_COPY_AND_ASSIGN(TCPServerSocketFactory);
-};
-
-} // namespace
+#include "net/socket/tcp_listen_socket.h"
RemoteDebuggingServer::RemoteDebuggingServer(
chrome::HostDesktopType host_desktop_type,
@@ -45,10 +24,8 @@
DCHECK(result);
}
- scoped_ptr<content::DevToolsHttpHandler::ServerSocketFactory> factory(
- new TCPServerSocketFactory(ip, port, 1));
devtools_http_handler_ = content::DevToolsHttpHandler::Start(
- factory.Pass(),
+ new net::TCPListenSocketFactory(ip, port),
"",
new BrowserListTabContentsProvider(host_desktop_type),
output_dir);
« no previous file with comments | « chrome/browser/devtools/device/android_web_socket.cc ('k') | chrome/test/chromedriver/net/net_util_unittest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698