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

Unified Diff: net/http/http_stream_factory_impl.h

Issue 2895263003: Revert CLs landed in HttpStreamFactoryImpl to track down a crasher (Closed)
Patch Set: Revert "Fix SpdySessionKey for HTTP/2 alternative Jobs." 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
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 58e4fddb9b20adbceb4d9759c82e01e12c7b2ae6..d9211d14c198db959fd2763fb58738619bb5f200 100644
--- a/net/http/http_stream_factory_impl.h
+++ b/net/http/http_stream_factory_impl.h
@@ -8,9 +8,7 @@
#include <stddef.h>
#include <map>
-#include <memory>
#include <set>
-#include <string>
#include <vector>
#include "base/gtest_prod_util.h"
@@ -46,17 +44,16 @@ class NET_EXPORT_PRIVATE HttpStreamFactoryImpl : public HttpStreamFactory {
~HttpStreamFactoryImpl() override;
// HttpStreamFactory interface
- 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(
+ 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(
const HttpRequestInfo& info,
RequestPriority priority,
const SSLConfig& server_ssl_config,
@@ -67,7 +64,7 @@ class NET_EXPORT_PRIVATE HttpStreamFactoryImpl : public HttpStreamFactory {
bool enable_alternative_services,
const NetLogWithSource& net_log) override;
- std::unique_ptr<HttpStreamRequest> RequestBidirectionalStreamImpl(
+ HttpStreamRequest* RequestBidirectionalStreamImpl(
const HttpRequestInfo& info,
RequestPriority priority,
const SSLConfig& server_ssl_config,
@@ -123,7 +120,7 @@ class NET_EXPORT_PRIVATE HttpStreamFactoryImpl : public HttpStreamFactory {
MAX_ALTERNATIVE_SERVICE_TYPE
};
- std::unique_ptr<HttpStreamRequest> RequestStreamInternal(
+ HttpStreamRequest* RequestStreamInternal(
const HttpRequestInfo& info,
RequestPriority priority,
const SSLConfig& server_ssl_config,

Powered by Google App Engine
This is Rietveld 408576698