summaryrefslogtreecommitdiffstats
path: root/net/spdy/spdy_framer_test.cc
diff options
context:
space:
mode:
Diffstat (limited to 'net/spdy/spdy_framer_test.cc')
-rw-r--r--net/spdy/spdy_framer_test.cc11
1 files changed, 2 insertions, 9 deletions
diff --git a/net/spdy/spdy_framer_test.cc b/net/spdy/spdy_framer_test.cc
index 2fac2f9..8daaca5 100644
--- a/net/spdy/spdy_framer_test.cc
+++ b/net/spdy/spdy_framer_test.cc
@@ -2090,18 +2090,11 @@ TEST_P(SpdyFramerTest, CreateSettings) {
0x0a, 0x0b, 0x0c, 0x0d,
};
- scoped_ptr<SpdySettingsControlFrame> frame(framer.CreateSettings(settings));
+ scoped_ptr<SpdyFrame> frame(framer.CreateSettings(settings));
CompareFrame(kDescription,
*frame,
IsSpdy2() ? kFrameDatav2 : kFrameDatav3,
arraysize(kFrameDatav3)); // Size is unchanged among versions.
-
- // Make sure that ParseSettings also works as advertised.
- SettingsMap parsed_settings;
- EXPECT_TRUE(framer.ParseSettings(frame.get(), &parsed_settings));
- EXPECT_EQ(settings.size(), parsed_settings.size());
- EXPECT_EQ(kFlags, parsed_settings[kId].first);
- EXPECT_EQ(kValue, parsed_settings[kId].second);
}
{
@@ -2130,7 +2123,7 @@ TEST_P(SpdyFramerTest, CreateSettings) {
0x03, 0x00, 0x00, 0x03, // 4th Setting
0xff, 0x00, 0x00, 0x04,
};
- scoped_ptr<SpdySettingsControlFrame> frame(framer.CreateSettings(settings));
+ scoped_ptr<SpdyFrame> frame(framer.CreateSettings(settings));
CompareFrame(kDescription,
*frame,
kFrameData,