Merge SettingsMap changes from server code

net/spdy/spdy_protocol_test.cc

Index: net/spdy/spdy_protocol_test.cc
diff --git a/net/spdy/spdy_protocol_test.cc b/net/spdy/spdy_protocol_test.cc
index d4d9b1fa2a1d121e3790fb28748f03aef00b7c3a..f71f0d28bf0b32c0d6998f352b86ed76ea449646 100644
--- a/net/spdy/spdy_protocol_test.cc
+++ b/net/spdy/spdy_protocol_test.cc
@@ -245,9 +245,10 @@ TEST_P(SpdyProtocolTest, TestSpdySettingsFrame) {
     SettingsMap parsed_settings;
     EXPECT_TRUE(framer.ParseSettings(settings_frame.get(), &parsed_settings));
     EXPECT_EQ(settings.size(), parsed_settings.size());
-    SettingsMap::const_iterator it, it2;
-    for (it = parsed_settings.begin(); it != parsed_settings.end(); it++) {
-      it2 = settings.find(it->first);
+    for (SettingsMap::const_iterator it = parsed_settings.begin();
+         it != parsed_settings.end();
+         it++) {
+      SettingsMap::const_iterator it2 = settings.find(it->first);
       EXPECT_EQ(it->first, it2->first);
       SettingsFlagsAndValue parsed = it->second;
       SettingsFlagsAndValue created = it2->second;