| 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 3220e050a8e60c62c3a55d74b72601ff3bfcf90b..e9cee0bec6ca3171d42bf2a337abb4e59f7f6aab 100644
|
| --- a/content/browser/devtools/devtools_http_handler_impl.h
|
| +++ b/content/browser/devtools/devtools_http_handler_impl.h
|
| @@ -27,7 +27,7 @@
|
| }
|
|
|
| namespace net {
|
| -class ServerSocketFactory;
|
| +class StreamListenSocketFactory;
|
| class URLRequestContextGetter;
|
| }
|
|
|
| @@ -43,7 +43,8 @@
|
| friend class base::RefCountedThreadSafe<DevToolsHttpHandlerImpl>;
|
| friend class DevToolsHttpHandler;
|
|
|
| - DevToolsHttpHandlerImpl(scoped_ptr<ServerSocketFactory> server_socket_factory,
|
| + // Takes ownership over |socket_factory|.
|
| + DevToolsHttpHandlerImpl(const net::StreamListenSocketFactory* socket_factory,
|
| const std::string& frontend_url,
|
| DevToolsHttpHandlerDelegate* delegate,
|
| const base::FilePath& active_port_output_directory);
|
| @@ -116,12 +117,12 @@
|
| scoped_ptr<base::Thread> thread_;
|
|
|
| std::string frontend_url_;
|
| - const scoped_ptr<ServerSocketFactory> server_socket_factory_;
|
| - scoped_ptr<net::HttpServer> server_;
|
| + scoped_ptr<const net::StreamListenSocketFactory> socket_factory_;
|
| + scoped_refptr<net::HttpServer> server_;
|
| typedef std::map<int, DevToolsAgentHostClient*> ConnectionToClientMap;
|
| ConnectionToClientMap connection_to_client_ui_;
|
| - const scoped_ptr<DevToolsHttpHandlerDelegate> delegate_;
|
| - const base::FilePath active_port_output_directory_;
|
| + scoped_ptr<DevToolsHttpHandlerDelegate> delegate_;
|
| + base::FilePath active_port_output_directory_;
|
| typedef std::map<std::string, DevToolsTarget*> TargetMap;
|
| TargetMap target_map_;
|
| typedef std::map<int, scoped_refptr<DevToolsBrowserTarget> > BrowserTargets;
|
|
|