| 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 0d08d9897aa2e3fd05c065d28e74a8d54973a611..0137dc77c085aee7bb684a21660d41c1c7718097 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;
|
| }
|
|
|
| @@ -43,8 +43,7 @@ class DevToolsHttpHandlerImpl
|
| friend class base::RefCountedThreadSafe<DevToolsHttpHandlerImpl>;
|
| friend class DevToolsHttpHandler;
|
|
|
| - // Takes ownership over |socket_factory|.
|
| - DevToolsHttpHandlerImpl(const net::StreamListenSocketFactory* socket_factory,
|
| + DevToolsHttpHandlerImpl(scoped_ptr<ServerSocketFactory> server_socket_factory,
|
| const std::string& frontend_url,
|
| DevToolsHttpHandlerDelegate* delegate,
|
| const base::FilePath& active_port_output_directory);
|
| @@ -117,8 +116,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<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_;
|
|
|