| Index: net/test/embedded_test_server/embedded_test_server.h
|
| diff --git a/net/test/embedded_test_server/embedded_test_server.h b/net/test/embedded_test_server/embedded_test_server.h
|
| index 879c4a947f920860c93cd1049250573ed5cdaf2b..6a5203f5c227e5b2829d215155341d7bec9c455b 100644
|
| --- a/net/test/embedded_test_server/embedded_test_server.h
|
| +++ b/net/test/embedded_test_server/embedded_test_server.h
|
| @@ -33,10 +33,10 @@ class HttpListenSocket : public TCPListenSocket {
|
| public:
|
| HttpListenSocket(const SocketDescriptor socket_descriptor,
|
| StreamListenSocket::Delegate* delegate);
|
| + virtual ~HttpListenSocket();
|
| virtual void Listen();
|
|
|
| private:
|
| - virtual ~HttpListenSocket();
|
|
|
| base::ThreadChecker thread_checker_;
|
| };
|
| @@ -137,7 +137,7 @@ class EmbeddedTestServer : public StreamListenSocket::Delegate {
|
|
|
| // StreamListenSocket::Delegate overrides:
|
| virtual void DidAccept(StreamListenSocket* server,
|
| - StreamListenSocket* connection) OVERRIDE;
|
| + scoped_ptr<StreamListenSocket> connection) OVERRIDE;
|
| virtual void DidRead(StreamListenSocket* connection,
|
| const char* data,
|
| int length) OVERRIDE;
|
| @@ -147,7 +147,7 @@ class EmbeddedTestServer : public StreamListenSocket::Delegate {
|
|
|
| scoped_refptr<base::SingleThreadTaskRunner> io_thread_;
|
|
|
| - scoped_refptr<HttpListenSocket> listen_socket_;
|
| + scoped_ptr<HttpListenSocket> listen_socket_;
|
| int port_;
|
| GURL base_url_;
|
|
|
|
|