net: disable SPDY compression.

This change is being landed temporarily on trunk for testing. It'll be
reverted once the change has be shown to be safe for merging.

BUG=139744

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@153697 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 10 insertions, 4 deletions

diff --git a/net/spdy/spdy_framer.cc b/net/spdy/spdy_framer.cc
index fc1bb06..53ed6f6 100644
--- a/net/spdy/spdy_framer.cc
+++ b/net/spdy/spdy_framer.cc
@@ -1467,7 +1467,7 @@ SpdyDataFrame* SpdyFramer::CreateDataFrame(
 // The following compression setting are based on Brian Olson's analysis. See
 // https://groups.google.com/group/spdy-dev/browse_thread/thread/dfaf498542fac792
 // for more details.
-static const int kCompressorLevel = 9;
+static const int kCompressorLevel = 0;
 static const int kCompressorWindowSizeInBits = 11;
 static const int kCompressorMemLevel = 1;
 
diff --git a/net/spdy/spdy_framer_test.cc b/net/spdy/spdy_framer_test.cc
index fc78e20..ef7ca90 100644
--- a/net/spdy/spdy_framer_test.cc
+++ b/net/spdy/spdy_framer_test.cc
@@ -1669,7 +1669,9 @@ TEST_P(SpdyFramerTest, CreateSynStreamUncompressed) {
   }
 }
 
-TEST_P(SpdyFramerTest, CreateSynStreamCompressed) {
+// TODO(agl): reenable this test once disabling SPDY compression has been
+// tested on Canary. See crbug.com/139744.
+TEST_P(SpdyFramerTest, DISABLED_CreateSynStreamCompressed) {
   SpdyFramer framer(spdy_version_);
   framer.set_enable_compression(true);
 
@@ -1857,7 +1859,9 @@ TEST_P(SpdyFramerTest, CreateSynReplyUncompressed) {
   }
 }
 
-TEST_P(SpdyFramerTest, CreateSynReplyCompressed) {
+// TODO(agl): reenable this test once disabling SPDY compression has been
+// tested on Canary. See crbug.com/139744.
+TEST_P(SpdyFramerTest, DISABLED_CreateSynReplyCompressed) {
   SpdyFramer framer(spdy_version_);
   framer.set_enable_compression(true);
 
@@ -2249,7 +2253,9 @@ TEST_P(SpdyFramerTest, CreateHeadersUncompressed) {
   }
 }
 
-TEST_P(SpdyFramerTest, CreateHeadersCompressed) {
+// TODO(agl): reenable this test once disabling SPDY compression has been
+// tested on Canary. See crbug.com/139744.
+TEST_P(SpdyFramerTest, DISABLED_CreateHeadersCompressed) {
   SpdyFramer framer(spdy_version_);
   framer.set_enable_compression(true);