Upstream version 9.38.198.0

[platform/framework/web/crosswalk.git] / src / net / quic / quic_stream_factory.h

diff --git a/src/net/quic/quic_stream_factory.h b/src/net/quic/quic_stream_factory.h
index b0280e2..6a02168 100644 (file)
--- a/src/net/quic/quic_stream_factory.h
+++ b/src/net/quic/quic_stream_factory.h
@@ -27,6 +27,7 @@
 namespace net {
 
 class CertVerifier;
+class ChannelIDService;
 class ClientSocketFactory;
 class HostResolver;
 class HttpServerProperties;
@@ -52,7 +53,7 @@ class NET_EXPORT_PRIVATE QuicStreamRequest {
   explicit QuicStreamRequest(QuicStreamFactory* factory);
   ~QuicStreamRequest();
 
-  // For http, |is_https| is false and |cert_verifier| can be null.
+  // For http, |is_https| is false.
   int Request(const HostPortPair& host_port_pair,
               bool is_https,
               PrivacyMode privacy_mode,
@@ -92,6 +93,7 @@ class NET_EXPORT_PRIVATE QuicStreamFactory
       ClientSocketFactory* client_socket_factory,
       base::WeakPtr<HttpServerProperties> http_server_properties,
       CertVerifier* cert_verifier,
+      ChannelIDService* channel_id_service,
       TransportSecurityState* transport_security_state,
       QuicCryptoClientStreamFactory* quic_crypto_client_stream_factory,
       QuicRandom* random_generator,
@@ -100,17 +102,15 @@ class NET_EXPORT_PRIVATE QuicStreamFactory
       const std::string& user_agent_id,
       const QuicVersionVector& supported_versions,
       bool enable_port_selection,
-      bool enable_pacing,
-      bool enable_time_based_loss_detection);
+      bool enable_time_based_loss_detection,
+      const QuicTagVector& connection_options);
   virtual ~QuicStreamFactory();
 
   // Creates a new QuicHttpStream to |host_port_pair| which will be
   // owned by |request|. |is_https| specifies if the protocol is https or not.
-  // |cert_verifier| is used by ProofVerifier for verifying the certificate
-  // chain and signature. For http, this can be null. 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.
+  // 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,
@@ -237,7 +237,7 @@ class NET_EXPORT_PRIVATE QuicStreamFactory
   HostResolver* host_resolver_;
   ClientSocketFactory* client_socket_factory_;
   base::WeakPtr<HttpServerProperties> http_server_properties_;
-  CertVerifier* cert_verifier_;
+  TransportSecurityState* transport_security_state_;
   QuicServerInfoFactory* quic_server_info_factory_;
   QuicCryptoClientStreamFactory* quic_crypto_client_stream_factory_;
   QuicRandom* random_generator_;