Move shared QUIC code to the quic:: namespace.
Cq-Include-Trybots: master.tryserver.chromium.android:android_cronet_tester;master.tryserver.chromium.mac:ios-simulator-cronet
Change-Id: If8d35a988db02793af1624068276d021903319be
Reviewed-on: https://chromium-review.googlesource.com/1071068
Commit-Queue: Ryan Hamilton <[email protected]>
Reviewed-by: Misha Efimov <[email protected]>
Reviewed-by: Zhongyi Shi <[email protected]>
Cr-Commit-Position: refs/heads/master@{#562656}diff --git a/net/http/http_network_session.h b/net/http/http_network_session.h
index 934fe95f..ba099ff6 100644
--- a/net/http/http_network_session.h
+++ b/net/http/http_network_session.h
@@ -59,7 +59,11 @@
class NetworkQualityProvider;
class ProxyDelegate;
class ProxyResolutionService;
+} // namespace net
+namespace quic {
class QuicClock;
+} // namespace quic
+namespace net {
class QuicCryptoClientStreamFactory;
class SocketPerformanceWatcherFactory;
class SOCKSClientSocketPool;
@@ -123,7 +127,7 @@
// QUIC runtime configuration options.
// Versions of QUIC which may be used.
- QuicTransportVersionVector quic_supported_versions;
+ quic::QuicTransportVersionVector quic_supported_versions;
// User agent description to send in the QUIC handshake.
std::string quic_user_agent_id;
// Limit on the size of QUIC packets.
@@ -134,10 +138,10 @@
// QUIC will be used for all connections in this set.
std::set<HostPortPair> origins_to_force_quic_on;
// Set of QUIC tags to send in the handshake's connection options.
- QuicTagVector quic_connection_options;
+ quic::QuicTagVector quic_connection_options;
// Set of QUIC tags to send in the handshake's connection options that only
// affect the client.
- QuicTagVector quic_client_connection_options;
+ quic::QuicTagVector quic_client_connection_options;
// Enables experimental optimization for receiving data in UDPSocket.
bool quic_enable_socket_recv_optimization;
@@ -240,9 +244,9 @@
NetworkQualityProvider* network_quality_provider;
// Source of time for QUIC connections.
- QuicClock* quic_clock;
+ quic::QuicClock* quic_clock;
// Source of entropy for QUIC connections.
- QuicRandom* quic_random;
+ quic::QuicRandom* quic_random;
// Optional factory to use for creating QuicCryptoClientStreams.
QuicCryptoClientStreamFactory* quic_crypto_client_stream_factory;
