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

Unified Diff: net/quic/quic_stream_factory.h

Issue 1393713003: Remove insecure QUIC support from Chromium. (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: Rebase Created 5 years, 2 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/quic/quic_network_transaction_unittest.cc ('k') | net/quic/quic_stream_factory.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/quic/quic_stream_factory.h
diff --git a/net/quic/quic_stream_factory.h b/net/quic/quic_stream_factory.h
index 6b5c6918e5e267186df5d5f679d7c71125438428..42d688abba9c2b9db256ec327656e6e7a94ba77d 100644
--- a/net/quic/quic_stream_factory.h
+++ b/net/quic/quic_stream_factory.h
@@ -61,11 +61,9 @@ class NET_EXPORT_PRIVATE QuicStreamRequest {
explicit QuicStreamRequest(QuicStreamFactory* factory);
~QuicStreamRequest();
- // For http, |is_https| is false.
// |cert_verify_flags| is bitwise OR'd of CertVerifier::VerifyFlags and it is
// passed to CertVerifier::Verify.
int Request(const HostPortPair& host_port_pair,
- bool is_https,
PrivacyMode privacy_mode,
int cert_verify_flags,
base::StringPiece origin_host,
@@ -93,7 +91,6 @@ class NET_EXPORT_PRIVATE QuicStreamRequest {
QuicStreamFactory* factory_;
HostPortPair host_port_pair_;
std::string origin_host_;
- bool is_https_;
PrivacyMode privacy_mode_;
BoundNetLog net_log_;
CompletionCallback callback_;
@@ -144,12 +141,11 @@ class NET_EXPORT_PRIVATE QuicStreamFactory
~QuicStreamFactory() override;
// Creates a new QuicHttpStream to |host_port_pair| which will be
- // owned by |request|. |is_https| specifies if the protocol is https or not.
+ // owned by |request|.
// If a matching session already exists, this method will return OK. If no
// matching session exists, this will return ERR_IO_PENDING and will invoke
// OnRequestComplete asynchronously.
int Create(const HostPortPair& host_port_pair,
- bool is_https,
PrivacyMode privacy_mode,
int cert_verify_flags,
base::StringPiece origin_host,
@@ -257,27 +253,12 @@ class NET_EXPORT_PRIVATE QuicStreamFactory
friend class test::QuicStreamFactoryPeer;
FRIEND_TEST_ALL_PREFIXES(HttpStreamFactoryTest, QuicLossyProxyMarkedAsBad);
- // The key used to find session by ip. Includes
- // the ip address, port, and scheme.
- struct NET_EXPORT_PRIVATE IpAliasKey {
- IpAliasKey();
- IpAliasKey(IPEndPoint ip_endpoint, bool is_https);
- ~IpAliasKey();
-
- IPEndPoint ip_endpoint;
- bool is_https;
-
- // Needed to be an element of std::set.
- bool operator<(const IpAliasKey &other) const;
- bool operator==(const IpAliasKey &other) const;
- };
-
typedef std::map<QuicServerId, QuicChromiumClientSession*> SessionMap;
typedef std::map<QuicChromiumClientSession*, QuicServerId> SessionIdMap;
typedef std::set<QuicServerId> AliasSet;
typedef std::map<QuicChromiumClientSession*, AliasSet> SessionAliasMap;
typedef std::set<QuicChromiumClientSession*> SessionSet;
- typedef std::map<IpAliasKey, SessionSet> IPAliasMap;
+ typedef std::map<IPEndPoint, SessionSet> IPAliasMap;
typedef std::map<QuicServerId, QuicCryptoClientConfig*> CryptoConfigMap;
typedef std::set<Job*> JobSet;
typedef std::map<QuicServerId, JobSet> JobMap;
« no previous file with comments | « net/quic/quic_network_transaction_unittest.cc ('k') | net/quic/quic_stream_factory.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698