diff options
| author | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 23:56:56 +0000 |
|---|---|---|
| committer | rch@chromium.org <rch@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98> | 2012-04-27 23:56:56 +0000 |
| commit | bd36c128f90bbaf5fffee8eabf8974d0191b2a5b (patch) | |
| tree | d59aeea13290ea7f4ef98ea818d19f1215bc7df9 /net/spdy/spdy_protocol_test.cc | |
| parent | 7a1667beb797bf91da3cbc881c5156db81d29ca7 (diff) | |
| download | chromium_src-bd36c128f90bbaf5fffee8eabf8974d0191b2a5b.zip chromium_src-bd36c128f90bbaf5fffee8eabf8974d0191b2a5b.tar.gz chromium_src-bd36c128f90bbaf5fffee8eabf8974d0191b2a5b.tar.bz2 | |
Merge SettingsMap changes from server code
Review URL: http://codereview.chromium.org/10254021
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@134400 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/spdy_protocol_test.cc')
| -rw-r--r-- | net/spdy/spdy_protocol_test.cc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/net/spdy/spdy_protocol_test.cc b/net/spdy/spdy_protocol_test.cc index d4d9b1f..f71f0d2 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; |