Revert of Update Zlib to version 1.2.8

net/spdy/spdy_framer_test.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "net/spdy/spdy_framer.h"
 
 #include <stdlib.h>
 #include <string.h>
 
 #include <algorithm>
@@ skipping 1454 matching lines @@
   syn_stream.SetHeader("content-type", "text/html");
   syn_stream.SetHeader("content-length", "12");
   SpdySerializedFrame frame1(framer.SerializeSynStream(syn_stream));
   size_t uncompressed_size1 = visitor->last_payload_len_;
   size_t compressed_size1 =
       visitor->last_frame_len_ - framer.GetSynStreamMinimumSize();
   EXPECT_EQ(165u, uncompressed_size1);
 #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_;
   size_t compressed_size2 =
       visitor->last_frame_len_ - framer.GetSynStreamMinimumSize();
 
   // Expect the second frame to be more compact than the first.
   EXPECT_LE(frame2.size(), frame1.size());
 
   // Decompress the first frame
   SpdySerializedFrame frame3(
       SpdyFramerTestUtil::DecompressFrame(&framer, frame1));
 
   // Decompress the second frame
   visitor.reset(new TestSpdyVisitor(spdy_version_));
   framer.set_debug_visitor(visitor.get());
   SpdySerializedFrame frame4(
       SpdyFramerTestUtil::DecompressFrame(&framer, frame2));
   size_t uncompressed_size4 = frame4.size() - framer.GetSynStreamMinimumSize();
   size_t compressed_size4 =
       visitor->last_frame_len_ - framer.GetSynStreamMinimumSize();
   EXPECT_EQ(165u, uncompressed_size4);
 #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);
   EXPECT_EQ(uncompressed_size1, uncompressed_size4);
   EXPECT_EQ(compressed_size2, compressed_size4);
 
   // Expect frames 3 & 4 to be the same.
   CompareFrames("Uncompressed SYN_STREAM", frame3, frame4);
 
   // Expect frames 3 to be the same as a uncompressed frame created
@@ skipping 911 matching lines @@
 
   SpdyFramer framer(spdy_version_);
   framer.set_enable_compression(true);
 
   {
     const char kDescription[] = "SYN_STREAM frame, low pri, no FIN";
 
     // 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,
       0xE3, 0xC6, 0xA7, 0xC2,
       0x02, 0xE5, 0x0E, 0x50,
       0xC2, 0x4B, 0x4A, 0x04,
       0xE5, 0x0B, 0x66, 0x80,
       0x00, 0x4A, 0xCB, 0xCF,
       0x07, 0x08, 0x20, 0x10,
       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,
       0xe3, 0xc6, 0xa7, 0xc2,
       0x02, 0xe5, 0x0e, 0x50,
       0xc2, 0x4b, 0x4a, 0x04,
       0xe5, 0x0b, 0x66, 0x80,
       0x00, 0x4a, 0xcb, 0xcf,
       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
 
     SpdySynStreamIR syn_stream(1);
     syn_stream.set_priority(4);
     syn_stream.SetHeader("bar", "foo");
     syn_stream.SetHeader("foo", "bar");
     SpdySerializedFrame frame(framer.SerializeSynStream(syn_stream));
     const unsigned char* frame_data =
         reinterpret_cast<const unsigned char*>(frame.data());
@@ skipping 120 matching lines @@
 
   SpdyFramer framer(spdy_version_);
   framer.set_enable_compression(true);
 
   {
     const char kDescription[] = "SYN_REPLY frame, no FIN";
 
     // 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,
       0x0e, 0x50, 0xc2, 0x4b,
       0x4a, 0x04, 0xe5, 0x0b,
       0x66, 0x80, 0x00, 0x4a,
       0xcb, 0xcf, 0x07, 0x08,
       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,
       0x0e, 0x50, 0xc2, 0x4b,
       0x4a, 0x04, 0xe5, 0x0b,
       0x66, 0x80, 0x00, 0x4a,
       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
 
     SpdySynReplyIR syn_reply(1);
     syn_reply.SetHeader("bar", "foo");
     syn_reply.SetHeader("foo", "bar");
     SpdySerializedFrame frame(framer.SerializeSynReply(syn_reply));
     const unsigned char* frame_data =
         reinterpret_cast<const unsigned char*>(frame.data());
     if (IsSpdy3()) {
@@ skipping 652 matching lines @@
 TEST_P(SpdyFramerTest, CreateHeadersCompressed) {
   SpdyFramer framer(spdy_version_);
   framer.set_enable_compression(true);
 
   {
     const char kDescription[] = "HEADERS frame, no FIN";
 
     // 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,
       0x0e, 0x50, 0xc2, 0x4b,
       0x4a, 0x04, 0xe5, 0x0b,
       0x66, 0x80, 0x00, 0x4a,
       0xcb, 0xcf, 0x07, 0x08,
       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,
       0x0e, 0x50, 0xc2, 0x4b,
       0x4a, 0x04, 0xe5, 0x0b,
       0x66, 0x80, 0x00, 0x4a,
       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
 
     SpdyHeadersIR headers_ir(1);
     headers_ir.SetHeader("bar", "foo");
     headers_ir.SetHeader("foo", "bar");
     SpdySerializedFrame frame(framer.SerializeHeaders(headers_ir));
     const unsigned char* frame_data =
         reinterpret_cast<const unsigned char*>(frame.data());
     if (IsSpdy3()) {
@@ skipping 2919 matching lines @@
 
     EXPECT_EQ(1, visitor->data_frame_count_);
     EXPECT_EQ(strlen(four_score), static_cast<unsigned>(visitor->data_bytes_));
     EXPECT_EQ(0, visitor->headers_frame_count_);
   }
 }
 
 }  // namespace test
 
 }  // namespace net