Use wire values in SpdySettingsIds.

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 1670 matching lines @@
   {
     const char kDescription[] = "Basic SETTINGS frame";
     // 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 kH2FrameData[] = {
         0x00, 0x00, 0x18,        // Length: 24
         0x04,                    //   Type: SETTINGS
         0x00,                    //  Flags: none
         0x00, 0x00, 0x00, 0x00,  // Stream: 0
+        0x00, 0x01,              //  Param: HEADER_TABLE_SIZE
+        0x00, 0x00, 0x00, 0x05,  //  Value: 5
+        0x00, 0x02,              //  Param: ENABLE_PUSH
+        0x00, 0x00, 0x00, 0x06,  //  Value: 6
         0x00, 0x03,              //  Param: MAX_CONCURRENT_STREAMS
         0x00, 0x00, 0x00, 0x07,  //  Value: 7
         0x00, 0x04,              //  Param: INITIAL_WINDOW_SIZE
         0x00, 0x00, 0x00, 0x08,  //  Value: 8
-        0x00, 0x01,              //  Param: HEADER_TABLE_SIZE
-        0x00, 0x00, 0x00, 0x05,  //  Value: 5
-        0x00, 0x02,              //  Param: ENABLE_PUSH
-        0x00, 0x00, 0x00, 0x06,  //  Value: 6
     };
 
     SpdySettingsIR settings_ir;
-    settings_ir.AddSetting(SpdyConstants::ParseSettingId(1),
+    settings_ir.AddSetting(SETTINGS_HEADER_TABLE_SIZE,
                            false,  // persist
                            false,  // persisted
                            5);
-    settings_ir.AddSetting(SpdyConstants::ParseSettingId(2),
+    settings_ir.AddSetting(SETTINGS_ENABLE_PUSH,
                            false,  // persist
                            false,  // persisted
                            6);
-    settings_ir.AddSetting(SpdyConstants::ParseSettingId(3),
+    settings_ir.AddSetting(SETTINGS_MAX_CONCURRENT_STREAMS,
                            false,  // persist
                            false,  // persisted
                            7);
-    settings_ir.AddSetting(SpdyConstants::ParseSettingId(4),
+    settings_ir.AddSetting(SETTINGS_INITIAL_WINDOW_SIZE,
                            false,  // persist
                            false,  // persisted
                            8);
     SpdySerializedFrame frame(framer.SerializeSettings(settings_ir));
 
     CompareFrame(kDescription, frame, kH2FrameData, arraysize(kH2FrameData));
   }
 
   {
     const char kDescription[] = "Empty SETTINGS frame";
@@ skipping 1054 matching lines @@
   EXPECT_EQ(1, visitor.error_count_);
   EXPECT_EQ(SpdyFramer::SPDY_INVALID_CONTROL_FRAME_SIZE,
             visitor.framer_.error_code())
       << SpdyFramer::ErrorCodeToString(visitor.framer_.error_code());
 }
 
 // Tests handling of SETTINGS frames larger than the frame buffer size.
 TEST_F(SpdyFramerTest, ReadLargeSettingsFrame) {
   SpdyFramer framer;
   SpdySettingsIR settings_ir;
-  settings_ir.AddSetting(SpdyConstants::ParseSettingId(1),
+  settings_ir.AddSetting(SETTINGS_HEADER_TABLE_SIZE,
                          false,  // persist
                          false,  // persisted
                          5);
-  settings_ir.AddSetting(SpdyConstants::ParseSettingId(2),
+  settings_ir.AddSetting(SETTINGS_ENABLE_PUSH,
                          false,  // persist
                          false,  // persisted
                          6);
-  settings_ir.AddSetting(SpdyConstants::ParseSettingId(3),
+  settings_ir.AddSetting(SETTINGS_MAX_CONCURRENT_STREAMS,
                          false,  // persist
                          false,  // persisted
                          7);
 
   SpdySerializedFrame control_frame(framer.SerializeSettings(settings_ir));
   EXPECT_LT(SpdyFramerPeer::ControlFrameBufferSize(), control_frame.size());
   TestSpdyVisitor visitor;
   visitor.use_compression_ = false;
 
   // Read all at once.
@@ skipping 554 matching lines @@
 
   // Simulate the case where the stream id validation checks out.
   visitor.on_unknown_frame_result_ = true;
   visitor.use_compression_ = false;
   visitor.SimulateInFramer(unknown_frame, arraysize(unknown_frame));
   EXPECT_EQ(0, visitor.error_count_);
 
   // Follow it up with a valid control frame to make sure we handle
   // subsequent frames correctly.
   SpdySettingsIR settings_ir;
-  settings_ir.AddSetting(SpdyConstants::ParseSettingId(1),
+  settings_ir.AddSetting(SETTINGS_HEADER_TABLE_SIZE,
                          false,  // persist
                          false,  // persisted
                          10);
   SpdySerializedFrame control_frame(framer.SerializeSettings(settings_ir));
   visitor.SimulateInFramer(
       reinterpret_cast<unsigned char*>(control_frame.data()),
       control_frame.size());
   EXPECT_EQ(0, visitor.error_count_);
   EXPECT_EQ(1u, static_cast<unsigned>(visitor.setting_count_));
   EXPECT_EQ(1u, static_cast<unsigned>(visitor.settings_ack_sent_));
@@ skipping 951 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