Update SPDY4 settings ID to 16 bits (from 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 <algorithm>
 #include <iostream>
 #include <limits>
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
@@ skipping 2319 matching lines @@
       0x0a, 0x0b, 0x0c, 0x0d,
     };
     const unsigned char kV3FrameData[] = {
       0x80, spdy_version_ch_, 0x00, 0x04,
       0x00, 0x00, 0x00, 0x0c,
       0x00, 0x00, 0x00, 0x01,
       0x01, 0x00, 0x00, 0x07,
       0x0a, 0x0b, 0x0c, 0x0d,
     };
     const unsigned char kV4FrameData[] = {
-      0x00, 0x05, 0x04, 0x00,
+      0x00, 0x06, 0x04, 0x00,
       0x00, 0x00, 0x00, 0x00,
-      0x04, 0x0a, 0x0b, 0x0c,
-      0x0d,
+      0x00, 0x04, 0x0a, 0x0b,
+      0x0c, 0x0d,
     };
 
     uint32 kValue = 0x0a0b0c0d;
     SpdySettingsIR settings_ir;
 
     SpdySettingsFlags kFlags = static_cast<SpdySettingsFlags>(0x01);
     SpdySettingsIds kId = SETTINGS_INITIAL_WINDOW_SIZE;
     SettingsMap settings;
     settings[kId] = SettingsFlagsAndValue(kFlags, kValue);
     EXPECT_EQ(kFlags, settings[kId].first);
@@ skipping 39 matching lines @@
       0x00, 0x00, 0x00, 0x06,
       0x00, 0x00, 0x00, 0x03,  // 3rd Setting
       0x00, 0x00, 0x00, 0x07,
       0x00, 0x00, 0x00, 0x04,  // 4th Setting
       0x00, 0x00, 0x00, 0x08,
     };
     // These end up seemingly out of order because of the way that our internal
     // ordering for settings_ir works. HTTP2 has no requirement on ordering on
     // the wire.
     const unsigned char kV4FrameData[] = {
-      0x00, 0x14, 0x04, 0x00,
+      0x00, 0x18, 0x04, 0x00,
       0x00, 0x00, 0x00, 0x00,
-      0x03,                    // 3rd Setting
+      0x00, 0x03,              // 3rd Setting
       0x00, 0x00, 0x00, 0x07,
-      0x04,                    // 4th Setting
+      0x00, 0x04,              // 4th Setting
       0x00, 0x00, 0x00, 0x08,
-      0x01,                    // 1st Setting
+      0x00, 0x01,              // 1st Setting
       0x00, 0x00, 0x00, 0x05,
-      0x02,                    // 2nd Setting
+      0x00, 0x02,              // 2nd Setting
       0x00, 0x00, 0x00, 0x06,
     };
 
     SpdySettingsIR settings_ir;
     settings_ir.AddSetting(SpdyConstants::ParseSettingId(spdy_version_, 1),
                            false,  // persist
                            false,  // persisted
                            5);
     settings_ir.AddSetting(SpdyConstants::ParseSettingId(spdy_version_, 2),
                            false,  // persist
@@ skipping 1036 matching lines @@
     0x00, 0x00, 0x00, 0x1C,
     0x00, 0x00, 0x00, 0x03,
     0x00, 0x00, 0x00, 0x01,  // 1st Setting
     0x00, 0x00, 0x00, 0x02,
     0x00, 0x00, 0x00, 0x01,  // 2nd (duplicate) Setting
     0x00, 0x00, 0x00, 0x03,
     0x00, 0x00, 0x00, 0x03,  // 3rd (unprocessed) Setting
     0x00, 0x00, 0x00, 0x03,
   };
   const unsigned char kV4FrameData[] = {
-    0x00, 0x0f, 0x04, 0x00,
+    0x00, 0x12, 0x04, 0x00,
     0x00, 0x00, 0x00, 0x00,
-    0x01,  // 1st Setting
+    0x00, 0x01,  // 1st Setting
     0x00, 0x00, 0x00, 0x02,
-    0x01,  // 2nd (duplicate) Setting
+    0x00, 0x01,  // 2nd (duplicate) Setting
     0x00, 0x00, 0x00, 0x03,
-    0x03,  // 3rd (unprocessed) Setting
+    0x00, 0x03,  // 3rd (unprocessed) Setting
     0x00, 0x00, 0x00, 0x03,
   };
 
   TestSpdyVisitor visitor(spdy_version_);
   visitor.use_compression_ = false;
   if (IsSpdy2()) {
     visitor.SimulateInFramer(kV2FrameData, sizeof(kV2FrameData));
   } else if (IsSpdy3()) {
     visitor.SimulateInFramer(kV3FrameData, sizeof(kV3FrameData));
   } else {
@@ skipping 32 matching lines @@
     0x00, 0x00, 0x00, 0x1C,
     0x00, 0x00, 0x00, 0x03,
     0x00, 0x00, 0x00, 0x02,  // 1st Setting
     0x00, 0x00, 0x00, 0x02,
     0x00, 0x00, 0x00, 0x01,  // 2nd (out of order) Setting
     0x00, 0x00, 0x00, 0x03,
     0x00, 0x00, 0x01, 0x03,  // 3rd (unprocessed) Setting
     0x00, 0x00, 0x00, 0x03,
   };
   const unsigned char kV4FrameData[] = {
-    0x00, 0x0f, 0x04, 0x00,
+    0x00, 0x12, 0x04, 0x00,
     0x00, 0x00, 0x00, 0x00,
-    0x02,  // 1st Setting
+    0x00, 0x02,  // 1st Setting
     0x00, 0x00, 0x00, 0x02,
-    0x01,  // 2nd (out of order) Setting
+    0x00, 0x01,  // 2nd (out of order) Setting
     0x00, 0x00, 0x00, 0x03,
-    0x03,  // 3rd (unprocessed) Setting
+    0x00, 0x03,  // 3rd (unprocessed) Setting
     0x00, 0x00, 0x00, 0x03,
   };
 
   TestSpdyVisitor visitor(spdy_version_);
   visitor.use_compression_ = false;
   if (IsSpdy2()) {
     visitor.SimulateInFramer(kV2FrameData, sizeof(kV2FrameData));
   } else if (IsSpdy3()) {
     visitor.SimulateInFramer(kV3FrameData, sizeof(kV3FrameData));
   } else {
@@ skipping 1819 matching lines @@
   EXPECT_EQ(4u, framer.MapWeightToPriority(109));
   EXPECT_EQ(4u, framer.MapWeightToPriority(74));
   EXPECT_EQ(5u, framer.MapWeightToPriority(73));
   EXPECT_EQ(5u, framer.MapWeightToPriority(37));
   EXPECT_EQ(6u, framer.MapWeightToPriority(36));
   EXPECT_EQ(6u, framer.MapWeightToPriority(1));
   EXPECT_EQ(7u, framer.MapWeightToPriority(0));
 }
 
 }  // namespace net