| Index: content/browser/debugger/devtools_http_handler_impl.cc
|
| diff --git a/content/browser/debugger/devtools_http_handler_impl.cc b/content/browser/debugger/devtools_http_handler_impl.cc
|
| index bbe45a42e5c72ba3720905dcb32dc557ab5bb761..c7c13ecc873974abdf5949bda9c8642039fc73b3 100644
|
| --- a/content/browser/debugger/devtools_http_handler_impl.cc
|
| +++ b/content/browser/debugger/devtools_http_handler_impl.cc
|
| @@ -128,14 +128,12 @@ int DevToolsHttpHandler::GetFrontendResourceId(const std::string& name) {
|
|
|
| // static
|
| DevToolsHttpHandler* DevToolsHttpHandler::Start(
|
| - const std::string& ip,
|
| - int port,
|
| + const net::StreamListenSocketFactory* socket_factory,
|
| const std::string& frontend_url,
|
| net::URLRequestContextGetter* request_context_getter,
|
| DevToolsHttpHandlerDelegate* delegate) {
|
| DevToolsHttpHandlerImpl* http_handler =
|
| - new DevToolsHttpHandlerImpl(ip,
|
| - port,
|
| + new DevToolsHttpHandlerImpl(socket_factory,
|
| frontend_url,
|
| request_context_getter,
|
| delegate);
|
| @@ -528,14 +526,12 @@ void DevToolsHttpHandlerImpl::OnReadCompleted(net::URLRequest* request,
|
| }
|
|
|
| DevToolsHttpHandlerImpl::DevToolsHttpHandlerImpl(
|
| - const std::string& ip,
|
| - int port,
|
| + const net::StreamListenSocketFactory* socket_factory,
|
| const std::string& frontend_url,
|
| net::URLRequestContextGetter* request_context_getter,
|
| DevToolsHttpHandlerDelegate* delegate)
|
| - : ip_(ip),
|
| - port_(port),
|
| - overridden_frontend_url_(frontend_url),
|
| + : overridden_frontend_url_(frontend_url),
|
| + socket_factory_(socket_factory),
|
| request_context_getter_(request_context_getter),
|
| delegate_(delegate) {
|
| if (overridden_frontend_url_.empty())
|
| @@ -548,7 +544,7 @@ DevToolsHttpHandlerImpl::DevToolsHttpHandlerImpl(
|
| }
|
|
|
| void DevToolsHttpHandlerImpl::Init() {
|
| - server_ = new net::HttpServer(ip_, port_, this);
|
| + server_ = new net::HttpServer(*socket_factory_.get(), this);
|
| }
|
|
|
| // Run on I/O thread
|
|
|