diff options
| author | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 15:28:34 +0200 |
|---|---|---|
| committer | Allan Sandfeld Jensen <allan.jensen@qt.io> | 2018-08-28 13:54:51 +0000 |
| commit | 2a19c63448c84c1805fb1a585c3651318bb86ca7 (patch) | |
| tree | eb17888e8531aa6ee5e85721bd553b832a7e5156 /chromium/net/http/http_stream_factory_job_controller.cc | |
| parent | b014812705fc80bff0a5c120dfcef88f349816dc (diff) | |
| download | qtwebengine-chromium-2a19c63448c84c1805fb1a585c3651318bb86ca7.tar.gz | |
BASELINE: Update Chromium to 69.0.3497.70
Change-Id: I2b7b56e4e7a8b26656930def0d4575dc32b900a0
Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io>
Diffstat (limited to 'chromium/net/http/http_stream_factory_job_controller.cc')
| -rw-r--r-- | chromium/net/http/http_stream_factory_job_controller.cc | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/chromium/net/http/http_stream_factory_job_controller.cc b/chromium/net/http/http_stream_factory_job_controller.cc index 70e8391c9f4..d632aabbdc1 100644 --- a/chromium/net/http/http_stream_factory_job_controller.cc +++ b/chromium/net/http/http_stream_factory_job_controller.cc @@ -796,11 +796,11 @@ int HttpStreamFactory::JobController::DoCreateJobs() { // Create an alternative job if alternative service is set up for this domain. alternative_service_info_ = GetAlternativeServiceInfoFor(request_info_, delegate_, stream_type_); - QuicTransportVersion quic_version = QUIC_VERSION_UNSUPPORTED; + quic::QuicTransportVersion quic_version = quic::QUIC_VERSION_UNSUPPORTED; if (alternative_service_info_.protocol() == kProtoQUIC) { quic_version = SelectQuicVersion(alternative_service_info_.advertised_versions()); - DCHECK_NE(quic_version, QUIC_VERSION_UNSUPPORTED); + DCHECK_NE(quic_version, quic::QUIC_VERSION_UNSUPPORTED); } if (is_preconnect_) { @@ -1143,7 +1143,7 @@ HttpStreamFactory::JobController::GetAlternativeServiceInfoInternal( // If there is no QUIC version in the advertised versions that is // supported, ignore this entry. if (SelectQuicVersion(alternative_service_info.advertised_versions()) == - QUIC_VERSION_UNSUPPORTED) + quic::QUIC_VERSION_UNSUPPORTED) continue; // Check whether there is an existing QUIC session to use for this origin. @@ -1178,23 +1178,23 @@ HttpStreamFactory::JobController::GetAlternativeServiceInfoInternal( return first_alternative_service_info; } -QuicTransportVersion HttpStreamFactory::JobController::SelectQuicVersion( - const QuicTransportVersionVector& advertised_versions) { - const QuicTransportVersionVector& supported_versions = +quic::QuicTransportVersion HttpStreamFactory::JobController::SelectQuicVersion( + const quic::QuicTransportVersionVector& advertised_versions) { + const quic::QuicTransportVersionVector& supported_versions = session_->params().quic_supported_versions; if (advertised_versions.empty()) return supported_versions[0]; - for (const QuicTransportVersion& supported : supported_versions) { - for (const QuicTransportVersion& advertised : advertised_versions) { + for (const quic::QuicTransportVersion& supported : supported_versions) { + for (const quic::QuicTransportVersion& advertised : advertised_versions) { if (supported == advertised) { - DCHECK_NE(QUIC_VERSION_UNSUPPORTED, supported); + DCHECK_NE(quic::QUIC_VERSION_UNSUPPORTED, supported); return supported; } } } - return QUIC_VERSION_UNSUPPORTED; + return quic::QUIC_VERSION_UNSUPPORTED; } bool HttpStreamFactory::JobController::ShouldCreateAlternativeProxyServerJob( |