Revert of Update Zlib to version 1.2.8

net/spdy/spdy_framer_test.cc

Index: net/spdy/spdy_framer_test.cc
diff --git a/net/spdy/spdy_framer_test.cc b/net/spdy/spdy_framer_test.cc
index 979e9880ce01c4d6c169e037916c8dee6d2f349e..a9f670823be36c639c30221122146aa6c62b7a87 100644
--- a/net/spdy/spdy_framer_test.cc
+++ b/net/spdy/spdy_framer_test.cc
@@ -1472,7 +1472,7 @@
 #if defined(USE_SYSTEM_ZLIB)
   EXPECT_EQ(181u, compressed_size1);
 #else   // !defined(USE_SYSTEM_ZLIB)
-  EXPECT_EQ(116u, compressed_size1);
+  EXPECT_EQ(117u, compressed_size1);
 #endif  // !defined(USE_SYSTEM_ZLIB)
   SpdySerializedFrame frame2(framer.SerializeSynStream(syn_stream));
   size_t uncompressed_size2 = visitor->last_payload_len_;
@@ -1498,7 +1498,7 @@
 #if defined(USE_SYSTEM_ZLIB)
   EXPECT_EQ(175u, compressed_size4);
 #else   // !defined(USE_SYSTEM_ZLIB)
-  EXPECT_EQ(98u, compressed_size4);
+  EXPECT_EQ(99u, compressed_size4);
 #endif  // !defined(USE_SYSTEM_ZLIB)
 
   EXPECT_EQ(uncompressed_size1, uncompressed_size2);
@@ -2430,7 +2430,7 @@
     // clang-format off
     const unsigned char kV3FrameData[] = {
       0x80, 0x03, 0x00, 0x01,
-      0x00, 0x00, 0x00, 0x36,
+      0x00, 0x00, 0x00, 0x37,
       0x00, 0x00, 0x00, 0x01,
       0x00, 0x00, 0x00, 0x00,
       0x80, 0x00, 0x38, 0xEA,
@@ -2443,12 +2443,12 @@
       0x95, 0x96, 0x9F, 0x0F,
       0xA2, 0x00, 0x02, 0x28,
       0x29, 0xB1, 0x08, 0x20,
-      0x00, 0x00, 0x00, 0x00,
-      0xFF, 0xFF,
+      0x80, 0x00, 0x00, 0x00,
+      0x00, 0xFF, 0xFF,
     };
     const unsigned char kV3SIMDFrameData[] = {
       0x80, 0x03, 0x00, 0x01,
-      0x00, 0x00, 0x00, 0x31,
+      0x00, 0x00, 0x00, 0x32,
       0x00, 0x00, 0x00, 0x01,
       0x00, 0x00, 0x00, 0x00,
       0x80, 0x00, 0x38, 0xea,
@@ -2460,8 +2460,8 @@
       0x07, 0x08, 0x20, 0x24,
       0x0a, 0x20, 0x80, 0x92,
       0x12, 0x8b, 0x00, 0x02,
-      0x00, 0x00, 0x00, 0xff,
-      0xff,
+      0x08, 0x00, 0x00, 0x00,
+      0xff, 0xff,
     };
     // clang-format on
 
@@ -2602,7 +2602,7 @@
     // clang-format off
     const unsigned char kV3FrameData[] = {
       0x80, 0x03, 0x00, 0x02,
-      0x00, 0x00, 0x00, 0x30,
+      0x00, 0x00, 0x00, 0x31,
       0x00, 0x00, 0x00, 0x01,
       0x38, 0xea, 0xe3, 0xc6,
       0xa7, 0xc2, 0x02, 0xe5,
@@ -2613,13 +2613,13 @@
       0x20, 0x10, 0x95, 0x96,
       0x9f, 0x0f, 0xa2, 0x00,
       0x02, 0x28, 0x29, 0xb1,
-      0x08, 0x20, 0x00, 0x00,
-      0x00, 0x00, 0xff, 0xff,
-    };
-
+      0x08, 0x20, 0x80, 0x00,
+      0x00, 0x00, 0x00, 0xff,
+      0xff,
+    };
     const unsigned char kV3SIMDFrameData[] = {
       0x80, 0x03, 0x00, 0x02,
-      0x00, 0x00, 0x00, 0x2b,
+      0x00, 0x00, 0x00, 0x2c,
       0x00, 0x00, 0x00, 0x01,
       0x38, 0xea, 0xe3, 0xc6,
       0xa7, 0xc2, 0x02, 0xe5,
@@ -2629,8 +2629,8 @@
       0xcb, 0xcf, 0x07, 0x08,
       0x20, 0x24, 0x0a, 0x20,
       0x80, 0x92, 0x12, 0x8b,
-      0x00, 0x02, 0x00, 0x00,
-      0x00, 0xff, 0xff,
+      0x00, 0x02, 0x08, 0x00,
+      0x00, 0x00, 0xff, 0xff,
     };
     // clang-format on
 
@@ -3303,7 +3303,7 @@
     // clang-format off
     const unsigned char kV3FrameData[] = {
       0x80, 0x03, 0x00, 0x08,
-      0x00, 0x00, 0x00, 0x30,
+      0x00, 0x00, 0x00, 0x31,
       0x00, 0x00, 0x00, 0x01,
       0x38, 0xea, 0xe3, 0xc6,
       0xa7, 0xc2, 0x02, 0xe5,
@@ -3314,12 +3314,13 @@
       0x20, 0x10, 0x95, 0x96,
       0x9f, 0x0f, 0xa2, 0x00,
       0x02, 0x28, 0x29, 0xb1,
-      0x08, 0x20, 0x00, 0x00,
-      0x00, 0x00, 0xff, 0xff,
+      0x08, 0x20, 0x80, 0x00,
+      0x00, 0x00, 0x00, 0xff,
+      0xff,
     };
     const unsigned char kV3SIMDFrameData[] = {
       0x80, 0x03, 0x00, 0x08,
-      0x00, 0x00, 0x00, 0x2b,
+      0x00, 0x00, 0x00, 0x2c,
       0x00, 0x00, 0x00, 0x01,
       0x38, 0xea, 0xe3, 0xc6,
       0xa7, 0xc2, 0x02, 0xe5,
@@ -3329,8 +3330,8 @@
       0xcb, 0xcf, 0x07, 0x08,
       0x20, 0x24, 0x0a, 0x20,
       0x80, 0x92, 0x12, 0x8b,
-      0x00, 0x02, 0x00, 0x00,
-      0x00, 0xff, 0xff,
+      0x00, 0x02, 0x08, 0x00,
+      0x00, 0x00, 0xff, 0xff,
     };
     // clang-format on