summaryrefslogtreecommitdiffstats
path: root/net/spdy/buffered_spdy_framer_spdy3_unittest.cc
diff options
context:
space:
mode:
authorakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-26 10:18:01 +0000
committerakalin@chromium.org <akalin@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-02-26 10:18:01 +0000
commitd1918d67dc0ff7b67e22019d6469da5a8945b416 (patch)
treec0088fef0f96522aaa35fd5e70631ba2a261cbb5 /net/spdy/buffered_spdy_framer_spdy3_unittest.cc
parentf082bdf47ad0c58a0862b0332b32ac22f9d0b483 (diff)
downloadchromium_src-d1918d67dc0ff7b67e22019d6469da5a8945b416.zip
chromium_src-d1918d67dc0ff7b67e22019d6469da5a8945b416.tar.gz
chromium_src-d1918d67dc0ff7b67e22019d6469da5a8945b416.tar.bz2
Remove SpdyFrame::length(). Useful in SPDY 4 development.
This lands server change 42902236. Also adjusts various tests to use SpdyFrame::size() instead of SpdyFrame::length(). Review URL: https://chromiumcodereview.appspot.com/12319075 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@184619 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'net/spdy/buffered_spdy_framer_spdy3_unittest.cc')
-rw-r--r--net/spdy/buffered_spdy_framer_spdy3_unittest.cc8
1 files changed, 4 insertions, 4 deletions
diff --git a/net/spdy/buffered_spdy_framer_spdy3_unittest.cc b/net/spdy/buffered_spdy_framer_spdy3_unittest.cc
index 19fe716..b409e4b 100644
--- a/net/spdy/buffered_spdy_framer_spdy3_unittest.cc
+++ b/net/spdy/buffered_spdy_framer_spdy3_unittest.cc
@@ -194,7 +194,7 @@ TEST_F(BufferedSpdyFramerSpdy3Test, OnSetting) {
visitor.SimulateInFramer(
reinterpret_cast<unsigned char*>(control_frame->data()),
- control_frame->length() + framer.GetControlFrameMinimumSize());
+ control_frame->size());
EXPECT_EQ(0, visitor.error_count_);
EXPECT_EQ(2, visitor.setting_count_);
}
@@ -217,7 +217,7 @@ TEST_F(BufferedSpdyFramerSpdy3Test, ReadSynStreamHeaderBlock) {
TestBufferedSpdyVisitor visitor;
visitor.SimulateInFramer(
reinterpret_cast<unsigned char*>(control_frame.get()->data()),
- control_frame.get()->length() + framer.GetControlFrameMinimumSize());
+ control_frame.get()->size());
EXPECT_EQ(0, visitor.error_count_);
EXPECT_EQ(1, visitor.syn_frame_count_);
EXPECT_EQ(0, visitor.syn_reply_frame_count_);
@@ -240,7 +240,7 @@ TEST_F(BufferedSpdyFramerSpdy3Test, ReadSynReplyHeaderBlock) {
TestBufferedSpdyVisitor visitor;
visitor.SimulateInFramer(
reinterpret_cast<unsigned char*>(control_frame.get()->data()),
- control_frame.get()->length() + framer.GetControlFrameMinimumSize());
+ control_frame.get()->size());
EXPECT_EQ(0, visitor.error_count_);
EXPECT_EQ(0, visitor.syn_frame_count_);
EXPECT_EQ(1, visitor.syn_reply_frame_count_);
@@ -263,7 +263,7 @@ TEST_F(BufferedSpdyFramerSpdy3Test, ReadHeadersHeaderBlock) {
TestBufferedSpdyVisitor visitor;
visitor.SimulateInFramer(
reinterpret_cast<unsigned char*>(control_frame.get()->data()),
- control_frame.get()->length() + framer.GetControlFrameMinimumSize());
+ control_frame.get()->size());
EXPECT_EQ(0, visitor.error_count_);
EXPECT_EQ(0, visitor.syn_frame_count_);
EXPECT_EQ(0, visitor.syn_reply_frame_count_);