Merge 151720 - net: workaround compression leaks

net/spdy/spdy_framer_test.cc

Index: net/spdy/spdy_framer_test.cc
===================================================================
--- net/spdy/spdy_framer_test.cc	(revision 153495)
+++ net/spdy/spdy_framer_test.cc	(working copy)
@@ -1586,31 +1586,39 @@
     const SpdyPriority priority = IsSpdy2() ? 2 : 4;
     const unsigned char kV2FrameData[] = {
       0x80, spdy_version_, 0x00, 0x01,
-      0x00, 0x00, 0x00, 0x25,
+      0x00, 0x00, 0x00, 0x36,
       0x00, 0x00, 0x00, 0x01,
       0x00, 0x00, 0x00, 0x00,
       0x80, 0x00, 0x38, 0xea,
       0xdf, 0xa2, 0x51, 0xb2,
       0x62, 0x60, 0x62, 0x60,
       0x4e, 0x4a, 0x2c, 0x62,
-      0x60, 0x4e, 0xcb, 0xcf,
-      0x87, 0x12, 0x40, 0x2e,
-      0x00, 0x00, 0x00, 0xff,
-      0xff
+      0x60, 0x06, 0x08, 0xa0,
+      0xb4, 0xfc, 0x7c, 0x80,
+      0x00, 0x62, 0x60, 0x4e,
+      0xcb, 0xcf, 0x67, 0x60,
+      0x06, 0x08, 0xa0, 0xa4,
+      0xc4, 0x22, 0x80, 0x00,
+      0x02, 0x00, 0x00, 0x00,
+      0xff, 0xff,
     };
     const unsigned char kV3FrameData[] = {
       0x80, spdy_version_, 0x00, 0x01,
-      0x00, 0x00, 0x00, 0x27,
+      0x00, 0x00, 0x00, 0x37,
       0x00, 0x00, 0x00, 0x01,
       0x00, 0x00, 0x00, 0x00,
       0x80, 0x00, 0x38, 0xEA,
       0xE3, 0xC6, 0xA7, 0xC2,
       0x02, 0xE5, 0x0E, 0x50,
       0xC2, 0x4B, 0x4A, 0x04,
-      0xE5, 0x0B, 0xE6, 0xB4,
-      0xFC, 0x7C, 0x24, 0x0A,
-      0x28, 0x08, 0x00, 0x00,
-      0x00, 0xFF, 0xFF
+      0xE5, 0x0B, 0x66, 0x80,
+      0x00, 0x4A, 0xCB, 0xCF,
+      0x07, 0x08, 0x20, 0x10,
+      0x95, 0x96, 0x9F, 0x0F,
+      0xA2, 0x00, 0x02, 0x28,
+      0x29, 0xB1, 0x08, 0x20,
+      0x80, 0x00, 0x00, 0x00,
+      0x00, 0xFF, 0xFF,
     };
     scoped_ptr<SpdyFrame> frame(
         framer.CreateSynStream(1,  // stream id
@@ -1764,29 +1772,37 @@
 
     const unsigned char kV2FrameData[] = {
       0x80, spdy_version_, 0x00, 0x02,
-      0x00, 0x00, 0x00, 0x21,
+      0x00, 0x00, 0x00, 0x32,
       0x00, 0x00, 0x00, 0x01,
       0x00, 0x00, 0x38, 0xea,
       0xdf, 0xa2, 0x51, 0xb2,
       0x62, 0x60, 0x62, 0x60,
       0x4e, 0x4a, 0x2c, 0x62,
-      0x60, 0x4e, 0xcb, 0xcf,
-      0x87, 0x12, 0x40, 0x2e,
-      0x00, 0x00, 0x00, 0xff,
-      0xff
+      0x60, 0x06, 0x08, 0xa0,
+      0xb4, 0xfc, 0x7c, 0x80,
+      0x00, 0x62, 0x60, 0x4e,
+      0xcb, 0xcf, 0x67, 0x60,
+      0x06, 0x08, 0xa0, 0xa4,
+      0xc4, 0x22, 0x80, 0x00,
+      0x02, 0x00, 0x00, 0x00,
+      0xff, 0xff,
     };
     const unsigned char kV3FrameData[] = {
       0x80, spdy_version_, 0x00, 0x02,
-      0x00, 0x00, 0x00, 0x21,
+      0x00, 0x00, 0x00, 0x31,
       0x00, 0x00, 0x00, 0x01,
       0x38, 0xea, 0xe3, 0xc6,
       0xa7, 0xc2, 0x02, 0xe5,
       0x0e, 0x50, 0xc2, 0x4b,
       0x4a, 0x04, 0xe5, 0x0b,
-      0xe6, 0xb4, 0xfc, 0x7c,
-      0x24, 0x0a, 0x28, 0x08,
+      0x66, 0x80, 0x00, 0x4a,
+      0xcb, 0xcf, 0x07, 0x08,
+      0x20, 0x10, 0x95, 0x96,
+      0x9f, 0x0f, 0xa2, 0x00,
+      0x02, 0x28, 0x29, 0xb1,
+      0x08, 0x20, 0x80, 0x00,
       0x00, 0x00, 0x00, 0xff,
-      0xff
+      0xff,
     };
     scoped_ptr<SpdyFrame> frame(framer.CreateSynReply(
         1, CONTROL_FLAG_NONE, true, &headers));
@@ -2148,29 +2164,37 @@
 
     const unsigned char kV2FrameData[] = {
       0x80, spdy_version_, 0x00, 0x08,
-      0x00, 0x00, 0x00, 0x21,
+      0x00, 0x00, 0x00, 0x32,
       0x00, 0x00, 0x00, 0x01,
       0x00, 0x00, 0x38, 0xea,
       0xdf, 0xa2, 0x51, 0xb2,
       0x62, 0x60, 0x62, 0x60,
       0x4e, 0x4a, 0x2c, 0x62,
-      0x60, 0x4e, 0xcb, 0xcf,
-      0x87, 0x12, 0x40, 0x2e,
-      0x00, 0x00, 0x00, 0xff,
-      0xff
+      0x60, 0x06, 0x08, 0xa0,
+      0xb4, 0xfc, 0x7c, 0x80,
+      0x00, 0x62, 0x60, 0x4e,
+      0xcb, 0xcf, 0x67, 0x60,
+      0x06, 0x08, 0xa0, 0xa4,
+      0xc4, 0x22, 0x80, 0x00,
+      0x02, 0x00, 0x00, 0x00,
+      0xff, 0xff,
     };
     const unsigned char kV3FrameData[] = {
       0x80, spdy_version_, 0x00, 0x08,
-      0x00, 0x00, 0x00, 0x21,
+      0x00, 0x00, 0x00, 0x31,
       0x00, 0x00, 0x00, 0x01,
       0x38, 0xea, 0xe3, 0xc6,
       0xa7, 0xc2, 0x02, 0xe5,
       0x0e, 0x50, 0xc2, 0x4b,
       0x4a, 0x04, 0xe5, 0x0b,
-      0xe6, 0xb4, 0xfc, 0x7c,
-      0x24, 0x0a, 0x28, 0x08,
+      0x66, 0x80, 0x00, 0x4a,
+      0xcb, 0xcf, 0x07, 0x08,
+      0x20, 0x10, 0x95, 0x96,
+      0x9f, 0x0f, 0xa2, 0x00,
+      0x02, 0x28, 0x29, 0xb1,
+      0x08, 0x20, 0x80, 0x00,
       0x00, 0x00, 0x00, 0xff,
-      0xff
+      0xff,
     };
     scoped_ptr<SpdyFrame> frame(framer.CreateHeaders(
         1, CONTROL_FLAG_NONE, true, &headers));