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

Unified Diff: net/server/web_socket.h

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
« no previous file with comments | « net/server/http_server_unittest.cc ('k') | net/server/web_socket.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/server/web_socket.h
diff --git a/net/server/web_socket.h b/net/server/web_socket.h
index 9b3a794452af27537752c08bffad4a3431d4fcae..49ced84ee6de03980ed90ad855d30db73f2b15ad 100644
--- a/net/server/web_socket.h
+++ b/net/server/web_socket.h
@@ -8,12 +8,10 @@
#include <string>
#include "base/basictypes.h"
-#include "base/strings/string_piece.h"
namespace net {
class HttpConnection;
-class HttpServer;
class HttpServerRequestInfo;
class WebSocket {
@@ -25,12 +23,11 @@
FRAME_ERROR
};
- static WebSocket* CreateWebSocket(HttpServer* server,
- HttpConnection* connection,
+ static WebSocket* CreateWebSocket(HttpConnection* connection,
const HttpServerRequestInfo& request,
size_t* pos);
- static ParseResult DecodeFrameHybi17(const base::StringPiece& frame,
+ static ParseResult DecodeFrameHybi17(const std::string& frame,
bool client_frame,
int* bytes_consumed,
std::string* output);
@@ -44,10 +41,8 @@
virtual ~WebSocket() {}
protected:
- WebSocket(HttpServer* server, HttpConnection* connection);
-
- HttpServer* const server_;
- HttpConnection* const connection_;
+ explicit WebSocket(HttpConnection* connection);
+ HttpConnection* connection_;
private:
DISALLOW_COPY_AND_ASSIGN(WebSocket);
« no previous file with comments | « net/server/http_server_unittest.cc ('k') | net/server/web_socket.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698