summaryrefslogtreecommitdiffstats
path: root/chromecast
diff options
context:
space:
mode:
authorbyungchul@chromium.org <byungchul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-22 18:10:13 +0000
committerbyungchul@chromium.org <byungchul@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2014-08-22 18:12:05 +0000
commit3626bc39d629245a782c61ba0bc668583778e392 (patch)
tree7156999fdfb9044dd14d5463568b8f6ce01543fe /chromecast
parent1c2f071e2a14a39b215a897434d30834ae959560 (diff)
downloadchromium_src-3626bc39d629245a782c61ba0bc668583778e392.zip
chromium_src-3626bc39d629245a782c61ba0bc668583778e392.tar.gz
chromium_src-3626bc39d629245a782c61ba0bc668583778e392.tar.bz2
Replace StreamListenSocket with StreamSocket in HttpServer.
1) HttpServer gets ServerSocket instead of StreamListenSocket. 2) HttpConnection is just a container for socket, websocket, and pending read/write buffers. 3) HttpServer handles data buffering and asynchronous read/write. 4) HttpConnection has limit in data buffering, up to 1Mbytes by default. 5) For devtools, send buffer limit is 100Mbytes. 6) Unittests for buffer handling in HttpConnection. BUG=371906 Review URL: https://codereview.chromium.org/296053012 Cr-Commit-Position: refs/heads/master@{#291447} git-svn-id: svn://svn.chromium.org/chrome/trunk/src@291447 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'chromecast')
-rw-r--r--chromecast/shell/browser/devtools/remote_debugging_server.cc53
1 files changed, 46 insertions, 7 deletions
diff --git a/chromecast/shell/browser/devtools/remote_debugging_server.cc b/chromecast/shell/browser/devtools/remote_debugging_server.cc
index 076b066..57214f1 100644
--- a/chromecast/shell/browser/devtools/remote_debugging_server.cc
+++ b/chromecast/shell/browser/devtools/remote_debugging_server.cc
@@ -17,11 +17,11 @@
#include "content/public/browser/devtools_http_handler.h"
#include "content/public/common/content_switches.h"
#include "content/public/common/user_agent.h"
-#include "net/socket/tcp_listen_socket.h"
+#include "net/socket/tcp_server_socket.h"
#if defined(OS_ANDROID)
#include "content/public/browser/android/devtools_auth.h"
-#include "net/socket/unix_domain_socket_posix.h"
+#include "net/socket/unix_domain_server_socket_posix.h"
#endif // defined(OS_ANDROID)
namespace chromecast {
@@ -35,7 +35,45 @@ const char kFrontEndURL[] =
#endif // defined(OS_ANDROID)
const int kDefaultRemoteDebuggingPort = 9222;
-net::StreamListenSocketFactory* CreateSocketFactory(int port) {
+#if defined(OS_ANDROID)
+class UnixDomainServerSocketFactory
+ : public content::DevToolsHttpHandler::ServerSocketFactory {
+ public:
+ explicit UnixDomainServerSocketFactory(const std::string& socket_name)
+ : content::DevToolsHttpHandler::ServerSocketFactory(socket_name, 0, 1) {}
+
+ private:
+ // content::DevToolsHttpHandler::ServerSocketFactory.
+ virtual scoped_ptr<net::ServerSocket> Create() const OVERRIDE {
+ return scoped_ptr<net::ServerSocket>(
+ new net::UnixDomainServerSocket(
+ base::Bind(&content::CanUserConnectToDevTools),
+ true /* use_abstract_namespace */));
+ }
+
+ DISALLOW_COPY_AND_ASSIGN(UnixDomainServerSocketFactory);
+};
+#else
+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);
+};
+#endif
+
+scoped_ptr<content::DevToolsHttpHandler::ServerSocketFactory>
+CreateSocketFactory(int port) {
#if defined(OS_ANDROID)
base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
std::string socket_name = "content_shell_devtools_remote";
@@ -43,11 +81,12 @@ net::StreamListenSocketFactory* CreateSocketFactory(int port) {
socket_name = command_line->GetSwitchValueASCII(
switches::kRemoteDebuggingSocketName);
}
- return new net::UnixDomainSocketWithAbstractNamespaceFactory(
- socket_name, "", base::Bind(&content::CanUserConnectToDevTools));
+ return scoped_ptr<content::DevToolsHttpHandler::ServerSocketFactory>(
+ new UnixDomainServerSocketFactory(socket_name));
#else
- return new net::TCPListenSocketFactory("0.0.0.0", port);
-#endif // defined(OS_ANDROID)
+ return scoped_ptr<content::DevToolsHttpHandler::ServerSocketFactory>(
+ new TCPServerSocketFactory("0.0.0.0", port, 1));
+#endif
}
std::string GetFrontendUrl() {