Merge SettingsMap changes from server code

net/spdy/spdy_protocol_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_protocol.h"
 
 #include "base/memory/scoped_ptr.h"
 #include "net/spdy/spdy_bitmasks.h"
 #include "net/spdy/spdy_framer.h"
 #include "testing/platform_test.h"
@@ skipping 227 matching lines @@
     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());
 
     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;
       EXPECT_EQ(created.first, parsed.first);
       EXPECT_EQ(created.second, parsed.second);
     }
   }
 }
 
 TEST_P(SpdyProtocolTest, HasHeaderBlock) {
@@ skipping 118 matching lines @@
 
   rst_frame->set_status(
       static_cast<SpdyStatusCodes>(INVALID - 1));
   EXPECT_EQ(INVALID, rst_frame->status());
 
   rst_frame->set_status(NUM_STATUS_CODES);
   EXPECT_EQ(INVALID, rst_frame->status());
 }
 
 }  // namespace net