Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(300)

Unified Diff: net/http/http_stream_factory_impl.h

Issue 2893713004: Return Request as unique_ptr from JobController::Start(). (Closed)
Patch Set: Fix conflict with https://crrev.com/2887773006. Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « net/http/http_stream_factory.h ('k') | net/http/http_stream_factory_impl.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/http/http_stream_factory_impl.h
diff --git a/net/http/http_stream_factory_impl.h b/net/http/http_stream_factory_impl.h
index d9211d14c198db959fd2763fb58738619bb5f200..6074edce4e19dd17e2f0bf94a8581a872ee344ca 100644
--- a/net/http/http_stream_factory_impl.h
+++ b/net/http/http_stream_factory_impl.h
@@ -8,8 +8,9 @@
#include <stddef.h>
#include <map>
+#include <memory>
#include <set>
-#include <vector>
+#include <string>
#include "base/gtest_prod_util.h"
#include "base/macros.h"
@@ -44,16 +45,17 @@ class NET_EXPORT_PRIVATE HttpStreamFactoryImpl : public HttpStreamFactory {
~HttpStreamFactoryImpl() override;
// HttpStreamFactory interface
- HttpStreamRequest* RequestStream(const HttpRequestInfo& info,
- RequestPriority priority,
- const SSLConfig& server_ssl_config,
- const SSLConfig& proxy_ssl_config,
- HttpStreamRequest::Delegate* delegate,
- bool enable_ip_based_pooling,
- bool enable_alternative_services,
- const NetLogWithSource& net_log) override;
-
- HttpStreamRequest* RequestWebSocketHandshakeStream(
+ std::unique_ptr<HttpStreamRequest> RequestStream(
+ const HttpRequestInfo& info,
+ RequestPriority priority,
+ const SSLConfig& server_ssl_config,
+ const SSLConfig& proxy_ssl_config,
+ HttpStreamRequest::Delegate* delegate,
+ bool enable_ip_based_pooling,
+ bool enable_alternative_services,
+ const NetLogWithSource& net_log) override;
+
+ std::unique_ptr<HttpStreamRequest> RequestWebSocketHandshakeStream(
const HttpRequestInfo& info,
RequestPriority priority,
const SSLConfig& server_ssl_config,
@@ -64,7 +66,7 @@ class NET_EXPORT_PRIVATE HttpStreamFactoryImpl : public HttpStreamFactory {
bool enable_alternative_services,
const NetLogWithSource& net_log) override;
- HttpStreamRequest* RequestBidirectionalStreamImpl(
+ std::unique_ptr<HttpStreamRequest> RequestBidirectionalStreamImpl(
const HttpRequestInfo& info,
RequestPriority priority,
const SSLConfig& server_ssl_config,
@@ -120,7 +122,7 @@ class NET_EXPORT_PRIVATE HttpStreamFactoryImpl : public HttpStreamFactory {
MAX_ALTERNATIVE_SERVICE_TYPE
};
- HttpStreamRequest* RequestStreamInternal(
+ std::unique_ptr<HttpStreamRequest> RequestStreamInternal(
const HttpRequestInfo& info,
RequestPriority priority,
const SSLConfig& server_ssl_config,
« no previous file with comments | « net/http/http_stream_factory.h ('k') | net/http/http_stream_factory_impl.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698