SPDY - replaced SpdySettings (list) with SettingsMap

net/spdy/spdy_protocol_test.cc

Index: net/spdy/spdy_protocol_test.cc
===================================================================
--- net/spdy/spdy_protocol_test.cc	(revision 132592)
+++ net/spdy/spdy_protocol_test.cc	(working copy)
@@ -215,7 +215,7 @@
   SpdyFramer framer(spdy_version_);
 
   // Create a settings frame with no settings.
-  SpdySettings settings;
+  SettingsMap settings;
   scoped_ptr<SpdySettingsControlFrame> settings_frame(
       framer.CreateSettings(settings));
   EXPECT_EQ(framer.protocol_version(), settings_frame->version());
@@ -229,32 +229,33 @@
     SettingsFlagsAndId::FromWireFormat(spdy_version_, 0x00000000),
     SettingsFlagsAndId::FromWireFormat(spdy_version_, 0xffffffff),
     SettingsFlagsAndId::FromWireFormat(spdy_version_, 0xff000001),
-    SettingsFlagsAndId::FromWireFormat(spdy_version_, 0xffffffff),
     SettingsFlagsAndId::FromWireFormat(spdy_version_, 0x01000002),
-    SettingsFlagsAndId(3, 1)
+    SettingsFlagsAndId(6, 9)
   };
 
   for (size_t index = 0; index < arraysize(ids); ++index) {
-    settings.insert(settings.end(), std::make_pair(ids[index], index));
+    SettingsFlagsAndId flags_and_id = ids[index];
+    SpdySettingsIds id = static_cast<SpdySettingsIds>(flags_and_id.id());
+    SpdySettingsFlags flags =
+        static_cast<SpdySettingsFlags>(flags_and_id.flags());
+    settings[id] = SettingsFlagsAndValue(flags, index);
     settings_frame.reset(framer.CreateSettings(settings));
     EXPECT_EQ(framer.protocol_version(), settings_frame->version());
     EXPECT_TRUE(settings_frame->is_control_frame());
     EXPECT_EQ(SETTINGS, settings_frame->type());
     EXPECT_EQ(index + 1, settings_frame->num_entries());
 
-    SpdySettings parsed_settings;
+    SettingsMap parsed_settings;
     EXPECT_TRUE(framer.ParseSettings(settings_frame.get(), &parsed_settings));
     EXPECT_EQ(settings.size(), parsed_settings.size());
-    SpdySettings::const_iterator it = parsed_settings.begin();
-    int pos = 0;
-    while (it != parsed_settings.end()) {
-      SettingsFlagsAndId parsed = it->first;
-      uint32 value = it->second;
-      EXPECT_EQ(ids[pos].flags(), parsed.flags());
-      EXPECT_EQ(ids[pos].id(), parsed.id());
-      EXPECT_EQ(static_cast<uint32>(pos), value);
-      ++it;
-      ++pos;
+    SettingsMap::const_iterator it, it2;
+    for (it = parsed_settings.begin(); it != parsed_settings.end(); it++) {
+      it2 = settings.find(it->first);
+      EXPECT_EQ(it->first, it2->first);
+      SettingsFlagsAndValue parsed = it->second;
+      SettingsFlagsAndValue created = it2->second;
+      EXPECT_EQ(created.first, parsed.first);
+      EXPECT_EQ(created.second, parsed.second);
     }
   }
 }