| Index: content/browser/devtools/devtools_http_handler_impl.h
|
| diff --git a/content/browser/devtools/devtools_http_handler_impl.h b/content/browser/devtools/devtools_http_handler_impl.h
|
| index 8e9fe155238bd4c084709681641be5f5111d449e..322e3b9bcff0231696b9ed2deaefa9be5e6dfc59 100644
|
| --- a/content/browser/devtools/devtools_http_handler_impl.h
|
| +++ b/content/browser/devtools/devtools_http_handler_impl.h
|
| @@ -26,7 +26,7 @@ class Value;
|
| }
|
|
|
| namespace net {
|
| -class StreamListenSocketFactory;
|
| +class ServerSocketFactory;
|
| class URLRequestContextGetter;
|
| }
|
|
|
| @@ -44,9 +44,10 @@ class DevToolsHttpHandlerImpl
|
| friend class DevToolsHttpHandler;
|
|
|
| // Takes ownership over |socket_factory|.
|
| - DevToolsHttpHandlerImpl(const net::StreamListenSocketFactory* socket_factory,
|
| - const std::string& frontend_url,
|
| - DevToolsHttpHandlerDelegate* delegate);
|
| + DevToolsHttpHandlerImpl(
|
| + scoped_ptr<net::ServerSocketFactory> server_socket_factory,
|
| + const std::string& frontend_url,
|
| + DevToolsHttpHandlerDelegate* delegate);
|
| virtual ~DevToolsHttpHandlerImpl();
|
| void Start();
|
|
|
| @@ -114,8 +115,8 @@ class DevToolsHttpHandlerImpl
|
| scoped_ptr<base::Thread> thread_;
|
|
|
| std::string frontend_url_;
|
| - scoped_ptr<const net::StreamListenSocketFactory> socket_factory_;
|
| - scoped_refptr<net::HttpServer> server_;
|
| + scoped_ptr<net::ServerSocketFactory> server_socket_factory_;
|
| + scoped_ptr<net::HttpServer> server_;
|
| typedef std::map<int, DevToolsClientHost*> ConnectionToClientHostMap;
|
| ConnectionToClientHostMap connection_to_client_host_ui_;
|
| scoped_ptr<DevToolsHttpHandlerDelegate> delegate_;
|
|
|