| Index: net/server/http_server.h
|
| diff --git a/net/server/http_server.h b/net/server/http_server.h
|
| index 589d8875b5b4529bd27dd60e5f89fb126709e988..ecb17bdd8665f0132db92643ad987cc1b56d1ee5 100644
|
| --- a/net/server/http_server.h
|
| +++ b/net/server/http_server.h
|
| @@ -34,12 +34,12 @@ class HttpServer : public ListenSocket::ListenSocketDelegate,
|
| const std::string& data) = 0;
|
|
|
| virtual void OnClose(int connection_id) = 0;
|
| +
|
| protected:
|
| virtual ~Delegate() {}
|
| };
|
|
|
| HttpServer(const std::string& host, int port, HttpServer::Delegate* del);
|
| - virtual ~HttpServer();
|
|
|
| void AcceptWebSocket(int connection_id,
|
| const HttpServerRequestInfo& request);
|
| @@ -53,10 +53,6 @@ class HttpServer : public ListenSocket::ListenSocketDelegate,
|
| void Send500(int connection_id, const std::string& message);
|
| void Close(int connection_id);
|
|
|
| -private:
|
| - friend class base::RefCountedThreadSafe<HttpServer>;
|
| - friend class HttpConnection;
|
| -
|
| // ListenSocketDelegate
|
| virtual void DidAccept(ListenSocket* server, ListenSocket* socket) OVERRIDE;
|
| virtual void DidRead(ListenSocket* socket,
|
| @@ -64,6 +60,13 @@ private:
|
| int len) OVERRIDE;
|
| virtual void DidClose(ListenSocket* socket) OVERRIDE;
|
|
|
| + protected:
|
| + virtual ~HttpServer();
|
| +
|
| + private:
|
| + friend class base::RefCountedThreadSafe<HttpServer>;
|
| + friend class HttpConnection;
|
| +
|
| // Expects the raw data to be stored in recv_data_. If parsing is successful,
|
| // will remove the data parsed from recv_data_, leaving only the unused
|
| // recv data.
|
|
|