Disable two recent Channel ID-related CLs to investigate a secure QUIC performance degradation.
The change to quic_stream_factory.cc disables
https://codereview.chromium.org/346323002/
The change to quic_crypto_client_stream.cc disables
https://codereview.chromium.org/355293003/
R=rch@chromium.org
BUG=396185
Review URL: https://codereview.chromium.org/414523004
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@284806 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/net/quic/quic_crypto_client_stream.cc b/net/quic/quic_crypto_client_stream.cc
index e55f1fe..962a1bc 100644
--- a/net/quic/quic_crypto_client_stream.cc
+++ b/net/quic/quic_crypto_client_stream.cc
@@ -238,7 +238,9 @@
CloseConnectionWithDetails(error, error_details);
return;
}
- channel_id_sent_ = (channel_id_key_.get() != NULL);
+ // TODO(wtc): a temporary change to measure the performance penalty of
+ // pooling connections less often if channel ID is used.
+ // channel_id_sent_ = (channel_id_key_.get() != NULL);
if (cached->proof_verify_details()) {
client_session()->OnProofVerifyDetailsAvailable(
*cached->proof_verify_details());
diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc
index c458660..f9f6802 100644
--- a/net/quic/quic_stream_factory.cc
+++ b/net/quic/quic_stream_factory.cc
@@ -485,8 +485,12 @@
crypto_config_.AddCanonicalSuffix(".c.youtube.com");
crypto_config_.AddCanonicalSuffix(".googlevideo.com");
crypto_config_.SetProofVerifier(new ProofVerifierChromium(cert_verifier));
+ // TODO(wtc): a temporary change to investigate the performance degradation
+ // caused by Channel ID lookup.
+#if 0
crypto_config_.SetChannelIDSource(
new ChannelIDSourceChromium(server_bound_cert_service));
+#endif
base::CPU cpu;
if (cpu.has_aesni() && cpu.has_avx())
crypto_config_.PreferAesGcm();