| 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 d55237d697967d24dbad0a4611cd7eac22f72b35..a7df97d4c0259a9ccff8729e64a4d2efa2b3a1fd 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,11 +43,11 @@ class DevToolsHttpHandlerImpl
|
| friend class base::RefCountedThreadSafe<DevToolsHttpHandlerImpl>;
|
| friend class DevToolsHttpHandler;
|
|
|
| - // 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);
|
| + DevToolsHttpHandlerImpl(
|
| + scoped_ptr<net::ServerSocketFactory> server_socket_factory,
|
| + const std::string& frontend_url,
|
| + DevToolsHttpHandlerDelegate* delegate,
|
| + const base::FilePath& active_port_output_directory);
|
| virtual ~DevToolsHttpHandlerImpl();
|
| void Start();
|
|
|
| @@ -117,8 +117,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_;
|
|
|