summaryrefslogtreecommitdiffstats
path: root/net
diff options
context:
space:
mode:
authorrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-02 03:22:10 +0000
committerrtenneti@chromium.org <rtenneti@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-10-02 03:22:10 +0000
commit3d410baab7a532b04859deccc607457550746651 (patch)
tree1de0023aa9bebf83e553b003000cf0013c00f84a /net
parent81f60c1e11d52456679a1d4a3b9ea14d9eb8dc6d (diff)
downloadchromium_src-3d410baab7a532b04859deccc607457550746651.zip
chromium_src-3d410baab7a532b04859deccc607457550746651.tar.gz
chromium_src-3d410baab7a532b04859deccc607457550746651.tar.bz2
Disabled shared crypto config code to isolate youtube performance issues
R=jar@chromium.org Review URL: https://codereview.chromium.org/25578002 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@226386 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net')
-rw-r--r--net/quic/quic_stream_factory.cc4
-rw-r--r--net/quic/quic_stream_factory_test.cc2
2 files changed, 4 insertions, 2 deletions
diff --git a/net/quic/quic_stream_factory.cc b/net/quic/quic_stream_factory.cc
index ddcf48f..ecb94f9 100644
--- a/net/quic/quic_stream_factory.cc
+++ b/net/quic/quic_stream_factory.cc
@@ -484,7 +484,9 @@ QuicCryptoClientConfig* QuicStreamFactory::GetOrCreateCryptoConfig(
crypto_config = new QuicCryptoClientConfig();
crypto_config->SetDefaults();
all_crypto_configs_[host_port_proxy_pair] = crypto_config;
- PopulateFromCanonicalConfig(host_port_proxy_pair, crypto_config);
+ // TODO(rtenneti): Temporarily disabled using CanonicalConfig until we fix
+ // performance problems.
+ // PopulateFromCanonicalConfig(host_port_proxy_pair, crypto_config);
}
return crypto_config;
}
diff --git a/net/quic/quic_stream_factory_test.cc b/net/quic/quic_stream_factory_test.cc
index 21b0087..c09fcc2 100644
--- a/net/quic/quic_stream_factory_test.cc
+++ b/net/quic/quic_stream_factory_test.cc
@@ -380,7 +380,7 @@ TEST_F(QuicStreamFactoryTest, OnIPAddressChanged) {
EXPECT_TRUE(socket_data2.at_write_eof());
}
-TEST_F(QuicStreamFactoryTest, SharedCryptoConfig) {
+TEST_F(QuicStreamFactoryTest, DISABLED_SharedCryptoConfig) {
HostPortProxyPair host_port_proxy_pair1(HostPortPair("r1.c.youtube.com", 80),
ProxyServer::Direct());