Index: net/http/http_stream_factory_impl.cc |
diff --git a/net/http/http_stream_factory_impl.cc b/net/http/http_stream_factory_impl.cc |
index b3ca1f76952737b0d6300aa0a181bd2e89699c52..c1b6eadc86ab4bdb8422a79cf39b308dd43e57cd 100644 |
--- a/net/http/http_stream_factory_impl.cc |
+++ b/net/http/http_stream_factory_impl.cc |
@@ -6,7 +6,6 @@ |
#include <string> |
#include <tuple> |
-#include <utility> |
#include "base/logging.h" |
#include "base/memory/ptr_util.h" |
@@ -46,7 +45,7 @@ |
job_controller_set_.size()); |
} |
-std::unique_ptr<HttpStreamRequest> HttpStreamFactoryImpl::RequestStream( |
+HttpStreamRequest* HttpStreamFactoryImpl::RequestStream( |
const HttpRequestInfo& request_info, |
RequestPriority priority, |
const SSLConfig& server_ssl_config, |
@@ -62,8 +61,7 @@ |
enable_alternative_services, net_log); |
} |
-std::unique_ptr<HttpStreamRequest> |
-HttpStreamFactoryImpl::RequestWebSocketHandshakeStream( |
+HttpStreamRequest* HttpStreamFactoryImpl::RequestWebSocketHandshakeStream( |
const HttpRequestInfo& request_info, |
RequestPriority priority, |
const SSLConfig& server_ssl_config, |
@@ -81,8 +79,7 @@ |
enable_alternative_services, net_log); |
} |
-std::unique_ptr<HttpStreamRequest> |
-HttpStreamFactoryImpl::RequestBidirectionalStreamImpl( |
+HttpStreamRequest* HttpStreamFactoryImpl::RequestBidirectionalStreamImpl( |
const HttpRequestInfo& request_info, |
RequestPriority priority, |
const SSLConfig& server_ssl_config, |
@@ -100,7 +97,7 @@ |
enable_alternative_services, net_log); |
} |
-std::unique_ptr<HttpStreamRequest> HttpStreamFactoryImpl::RequestStreamInternal( |
+HttpStreamRequest* HttpStreamFactoryImpl::RequestStreamInternal( |
const HttpRequestInfo& request_info, |
RequestPriority priority, |
const SSLConfig& server_ssl_config, |
@@ -120,9 +117,11 @@ |
enable_alternative_services, server_ssl_config, proxy_ssl_config); |
JobController* job_controller_raw_ptr = job_controller.get(); |
job_controller_set_.insert(std::move(job_controller)); |
- return job_controller_raw_ptr->Start(delegate, |
- websocket_handshake_stream_create_helper, |
- net_log, stream_type, priority); |
+ Request* request = job_controller_raw_ptr->Start( |
+ delegate, websocket_handshake_stream_create_helper, net_log, stream_type, |
+ priority); |
+ |
+ return request; |
} |
void HttpStreamFactoryImpl::PreconnectStreams( |