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

11 files changed, 42 insertions, 61 deletions

diff --git a/net/spdy/buffered_spdy_framer_spdy2_unittest.cc b/net/spdy/buffered_spdy_framer_spdy2_unittest.cc
index a0e8792..088ca1c 100644
--- a/net/spdy/buffered_spdy_framer_spdy2_unittest.cc
+++ b/net/spdy/buffered_spdy_framer_spdy2_unittest.cc
@@ -195,7 +195,7 @@ TEST_F(BufferedSpdyFramerSpdy2Test, 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_);
 }
@@ -218,7 +218,7 @@ TEST_F(BufferedSpdyFramerSpdy2Test, 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_);
@@ -241,7 +241,7 @@ TEST_F(BufferedSpdyFramerSpdy2Test, 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_);
@@ -264,7 +264,7 @@ TEST_F(BufferedSpdyFramerSpdy2Test, 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_);
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_);
diff --git a/net/spdy/spdy_frame_builder_test.cc b/net/spdy/spdy_frame_builder_test.cc
index ca03e6e..23f7a0b 100644
--- a/net/spdy/spdy_frame_builder_test.cc
+++ b/net/spdy/spdy_frame_builder_test.cc
@@ -51,15 +51,13 @@ TEST_P(SpdyFrameBuilderTest, RewriteLength) {
   SpdyFramer framer(spdy_version_);
   SettingsMap settings;
   scoped_ptr<SpdyFrame> expected(framer.CreateSettings(settings));
-  const size_t expected_size =
-      expected->length() + framer.GetControlFrameMinimumSize();
-  SpdyFrameBuilder builder(SETTINGS, 0, spdy_version_, expected_size + 1);
+  SpdyFrameBuilder builder(SETTINGS, 0, spdy_version_, expected->size() + 1);
   builder.WriteUInt32(0); // Write the number of settings.
   EXPECT_TRUE(builder.GetWritableBuffer(1) != NULL);
   builder.RewriteLength(framer);
   scoped_ptr<SpdyFrame> built(builder.take());
-  EXPECT_EQ(base::StringPiece(expected->data(), expected_size),
-            base::StringPiece(built->data(), expected_size));
+  EXPECT_EQ(base::StringPiece(expected->data(), expected->size()),
+            base::StringPiece(built->data(), expected->size()));
 }
 
 }  // namespace net
diff --git a/net/spdy/spdy_framer_test.cc b/net/spdy/spdy_framer_test.cc
index 5981e18..88baed9 100644
--- a/net/spdy/spdy_framer_test.cc
+++ b/net/spdy/spdy_framer_test.cc
@@ -784,7 +784,7 @@ TEST_P(SpdyFramerTest, ParseCredentialFrameData) {
     SpdyCredential credential;
     EXPECT_TRUE(SpdyFramer::ParseCredentialData(
         frame.data() + framer.GetControlFrameMinimumSize(),
-        frame.length(),
+        frame.size() - framer.GetControlFrameMinimumSize(),
         &credential));
     EXPECT_EQ(3u, credential.slot);
     EXPECT_EQ("proof", credential.proof);
@@ -2816,7 +2816,8 @@ TEST_P(SpdyFramerTest, ReadCredentialFrame) {
       reinterpret_cast<unsigned char*>(control_frame->data()),
       control_frame->size());
   EXPECT_EQ(0, visitor.error_count_);
-  EXPECT_EQ(control_frame->length(), visitor.credential_buffer_length_);
+  EXPECT_EQ(control_frame->size() - framer.GetControlFrameMinimumSize(),
+            visitor.credential_buffer_length_);
   EXPECT_EQ(credential.slot, visitor.credential_.slot);
   EXPECT_EQ(credential.proof, visitor.credential_.proof);
   EXPECT_EQ(credential.certs.size(), visitor.credential_.certs.size());
@@ -2846,7 +2847,8 @@ TEST_P(SpdyFramerTest, ReadCredentialFrameOneByteAtATime) {
     ASSERT_EQ(0, visitor.error_count_);
   }
   EXPECT_EQ(0, visitor.error_count_);
-  EXPECT_EQ(control_frame->length(), visitor.credential_buffer_length_);
+  EXPECT_EQ(control_frame->size() - framer.GetControlFrameMinimumSize(),
+            visitor.credential_buffer_length_);
   EXPECT_EQ(credential.slot, visitor.credential_.slot);
   EXPECT_EQ(credential.proof, visitor.credential_.proof);
   EXPECT_EQ(credential.certs.size(), visitor.credential_.certs.size());
diff --git a/net/spdy/spdy_network_transaction_spdy2_unittest.cc b/net/spdy/spdy_network_transaction_spdy2_unittest.cc
index 5c6d24e..5ef07c4 100644
--- a/net/spdy/spdy_network_transaction_spdy2_unittest.cc
+++ b/net/spdy/spdy_network_transaction_spdy2_unittest.cc
@@ -3517,8 +3517,9 @@ TEST_P(SpdyNetworkTransactionSpdy2Test, CorruptFrameSessionError) {
   // This is the length field that's too short.
   scoped_ptr<SpdyFrame> syn_reply_wrong_length(
       ConstructSpdyGetSynReply(NULL, 0, 1));
+  size_t wrong_size = syn_reply_wrong_length->size() - 4;
   test::SetFrameLength(syn_reply_wrong_length.get(),
-                       syn_reply_wrong_length->length() - 4,
+                       wrong_size - SpdyFrame::kHeaderSize,
                        kSpdyVersion2);
 
   struct SynReplyTests {
@@ -3537,7 +3538,7 @@ TEST_P(SpdyNetworkTransactionSpdy2Test, CorruptFrameSessionError) {
 
     scoped_ptr<SpdyFrame> body(ConstructSpdyBodyFrame(1, true));
     MockRead reads[] = {
-      CreateMockRead(*test_cases[i].syn_reply),
+      MockRead(ASYNC, test_cases[i].syn_reply->data(), wrong_size),
       CreateMockRead(*body),
       MockRead(ASYNC, 0, 0)  // EOF
     };
diff --git a/net/spdy/spdy_network_transaction_spdy3_unittest.cc b/net/spdy/spdy_network_transaction_spdy3_unittest.cc
index 5f7a1a8..aa777c1 100644
--- a/net/spdy/spdy_network_transaction_spdy3_unittest.cc
+++ b/net/spdy/spdy_network_transaction_spdy3_unittest.cc
@@ -4092,8 +4092,9 @@ TEST_P(SpdyNetworkTransactionSpdy3Test, CorruptFrameSessionError) {
   // This is the length field that's too short.
   scoped_ptr<SpdyFrame> syn_reply_wrong_length(
       ConstructSpdyGetSynReply(NULL, 0, 1));
+  size_t wrong_size = syn_reply_wrong_length->size() - 4;
   test::SetFrameLength(syn_reply_wrong_length.get(),
-                       syn_reply_wrong_length->length() - 4,
+                       wrong_size - SpdyFrame::kHeaderSize,
                        kSpdyVersion3);
 
   struct SynReplyTests {
@@ -4112,7 +4113,7 @@ TEST_P(SpdyNetworkTransactionSpdy3Test, CorruptFrameSessionError) {
 
     scoped_ptr<SpdyFrame> body(ConstructSpdyBodyFrame(1, true));
     MockRead reads[] = {
-      CreateMockRead(*test_cases[i].syn_reply),
+      MockRead(ASYNC, test_cases[i].syn_reply->data(), wrong_size),
       CreateMockRead(*body),
       MockRead(ASYNC, 0, 0)  // EOF
     };
diff --git a/net/spdy/spdy_protocol.h b/net/spdy/spdy_protocol.h
index 59aa09d..e250015 100644
--- a/net/spdy/spdy_protocol.h
+++ b/net/spdy/spdy_protocol.h
@@ -847,10 +847,6 @@ class SpdyFrame {
   // Returns the actual size of the underlying buffer.
   size_t size() const { return size_; }
 
-  uint32 length() const {
-    return ntohl(frame_->flags_length_.length_) & kLengthMask;
-  }
-
   // The size of the SpdyFrameBlock structure.
   // Every SpdyFrame* class has a static size() method for accessing
   // the size of the data structure which will be sent over the wire.
diff --git a/net/spdy/spdy_session.cc b/net/spdy/spdy_session.cc
index 6a39067..a3937ee 100644
--- a/net/spdy/spdy_session.cc
+++ b/net/spdy/spdy_session.cc
@@ -202,7 +202,7 @@ SpdyIOBuffer* SpdySession::SpdyIOBufferProducer::CreateIOBuffer(
     SpdyFrame* frame,
     RequestPriority priority,
     SpdyStream* stream) {
-  size_t size = frame->length() + SpdyFrame::kHeaderSize;
+  size_t size = frame->size();
   DCHECK_GT(size, 0u);
 
   // TODO(mbelshe): We have too much copying of data here.
diff --git a/net/spdy/spdy_test_util_common.cc b/net/spdy/spdy_test_util_common.cc
index a094d18..95affd3b 100644
--- a/net/spdy/spdy_test_util_common.cc
+++ b/net/spdy/spdy_test_util_common.cc
@@ -69,7 +69,7 @@ bool GetSpdyPriority(int version,
   BufferedSpdyFramer framer(version, false);
   PriorityGetter priority_getter;
   framer.set_visitor(&priority_getter);
-  size_t frame_size = frame.length() + SpdyFrame::kHeaderSize;
+  size_t frame_size = frame.size();
   if (framer.ProcessInput(frame.data(), frame_size) != frame_size) {
     return false;
   }
diff --git a/net/spdy/spdy_test_util_spdy2.cc b/net/spdy/spdy_test_util_spdy2.cc
index 895a0e8..8648eca 100644
--- a/net/spdy/spdy_test_util_spdy2.cc
+++ b/net/spdy/spdy_test_util_spdy2.cc
@@ -59,9 +59,7 @@ MockWrite* ChopWriteFrame(const char* data, int length, int num_chunks) {
 // |frame| is the frame to chop.
 // |num_chunks| is the number of chunks to create.
 MockWrite* ChopWriteFrame(const SpdyFrame& frame, int num_chunks) {
-  return ChopWriteFrame(frame.data(),
-                        frame.length() + SpdyFrame::kHeaderSize,
-                        num_chunks);
+  return ChopWriteFrame(frame.data(), frame.size(), num_chunks);
 }
 
 // Chop a frame into an array of MockReads.
@@ -84,9 +82,7 @@ MockRead* ChopReadFrame(const char* data, int length, int num_chunks) {
 // |frame| is the frame to chop.
 // |num_chunks| is the number of chunks to create.
 MockRead* ChopReadFrame(const SpdyFrame& frame, int num_chunks) {
-  return ChopReadFrame(frame.data(),
-                       frame.length() + SpdyFrame::kHeaderSize,
-                       num_chunks);
+  return ChopReadFrame(frame.data(), frame.size(), num_chunks);
 }
 
 // Adds headers and values to a map.
@@ -718,8 +714,7 @@ SpdyFrame* ConstructSpdyBodyFrame(int stream_id, const char* data,
 SpdyFrame* ConstructWrappedSpdyFrame(const scoped_ptr<SpdyFrame>& frame,
                                      int stream_id) {
   return ConstructSpdyBodyFrame(stream_id, frame->data(),
-                                frame->length() + SpdyFrame::kHeaderSize,
-                                false);
+                                frame->size(), false);
 }
 
 // Construct an expected SPDY reply string.
@@ -800,8 +795,7 @@ int ConstructSpdyReplyString(const char* const extra_headers[],
 
 // Create a MockWrite from the given SpdyFrame.
 MockWrite CreateMockWrite(const SpdyFrame& req) {
-  return MockWrite(
-      ASYNC, req.data(), req.length() + SpdyFrame::kHeaderSize);
+  return MockWrite(ASYNC, req.data(), req.size());
 }
 
 // Create a MockWrite from the given SpdyFrame and sequence number.
@@ -811,14 +805,12 @@ MockWrite CreateMockWrite(const SpdyFrame& req, int seq) {
 
 // Create a MockWrite from the given SpdyFrame and sequence number.
 MockWrite CreateMockWrite(const SpdyFrame& req, int seq, IoMode mode) {
-  return MockWrite(
-      mode, req.data(), req.length() + SpdyFrame::kHeaderSize, seq);
+  return MockWrite(mode, req.data(), req.size(), seq);
 }
 
 // Create a MockRead from the given SpdyFrame.
 MockRead CreateMockRead(const SpdyFrame& resp) {
-  return MockRead(
-      ASYNC, resp.data(), resp.length() + SpdyFrame::kHeaderSize);
+  return MockRead(ASYNC, resp.data(), resp.size());
 }
 
 // Create a MockRead from the given SpdyFrame and sequence number.
@@ -828,8 +820,7 @@ MockRead CreateMockRead(const SpdyFrame& resp, int seq) {
 
 // Create a MockRead from the given SpdyFrame and sequence number.
 MockRead CreateMockRead(const SpdyFrame& resp, int seq, IoMode mode) {
-  return MockRead(
-      mode, resp.data(), resp.length() + SpdyFrame::kHeaderSize, seq);
+  return MockRead(mode, resp.data(), resp.size(), seq);
 }
 
 // Combines the given SpdyFrames into the given char array and returns
@@ -838,12 +829,12 @@ int CombineFrames(const SpdyFrame** frames, int num_frames,
                   char* buff, int buff_len) {
   int total_len = 0;
   for (int i = 0; i < num_frames; ++i) {
-    total_len += frames[i]->length() + SpdyFrame::kHeaderSize;
+    total_len += frames[i]->size();
   }
   DCHECK_LE(total_len, buff_len);
   char* ptr = buff;
   for (int i = 0; i < num_frames; ++i) {
-    int len = frames[i]->length() + SpdyFrame::kHeaderSize;
+    int len = frames[i]->size();
     memcpy(ptr, frames[i]->data(), len);
     ptr += len;
   }
diff --git a/net/spdy/spdy_test_util_spdy3.cc b/net/spdy/spdy_test_util_spdy3.cc
index 1fb3c28..8832544 100644
--- a/net/spdy/spdy_test_util_spdy3.cc
+++ b/net/spdy/spdy_test_util_spdy3.cc
@@ -103,9 +103,7 @@ MockWrite* ChopWriteFrame(const char* data, int length, int num_chunks) {
 // |frame| is the frame to chop.
 // |num_chunks| is the number of chunks to create.
 MockWrite* ChopWriteFrame(const SpdyFrame& frame, int num_chunks) {
-  return ChopWriteFrame(frame.data(),
-                        frame.length() + SpdyFrame::kHeaderSize,
-                        num_chunks);
+  return ChopWriteFrame(frame.data(), frame.size(), num_chunks);
 }
 
 // Chop a frame into an array of MockReads.
@@ -128,9 +126,7 @@ MockRead* ChopReadFrame(const char* data, int length, int num_chunks) {
 // |frame| is the frame to chop.
 // |num_chunks| is the number of chunks to create.
 MockRead* ChopReadFrame(const SpdyFrame& frame, int num_chunks) {
-  return ChopReadFrame(frame.data(),
-                       frame.length() + SpdyFrame::kHeaderSize,
-                       num_chunks);
+  return ChopReadFrame(frame.data(), frame.size(), num_chunks);
 }
 
 // Adds headers and values to a map.
@@ -758,7 +754,7 @@ SpdyFrame* ConstructSpdyBodyFrame(int stream_id, const char* data,
 SpdyFrame* ConstructWrappedSpdyFrame(const scoped_ptr<SpdyFrame>& frame,
                                      int stream_id) {
   return ConstructSpdyBodyFrame(stream_id, frame->data(),
-                                frame->length() + SpdyFrame::kHeaderSize,
+                                frame->size(),
                                 false);
 }
 
@@ -842,8 +838,7 @@ int ConstructSpdyReplyString(const char* const extra_headers[],
 
 // Create a MockWrite from the given SpdyFrame.
 MockWrite CreateMockWrite(const SpdyFrame& req) {
-  return MockWrite(
-      ASYNC, req.data(), req.length() + SpdyFrame::kHeaderSize);
+  return MockWrite(ASYNC, req.data(), req.size());
 }
 
 // Create a MockWrite from the given SpdyFrame and sequence number.
@@ -853,14 +848,12 @@ MockWrite CreateMockWrite(const SpdyFrame& req, int seq) {
 
 // Create a MockWrite from the given SpdyFrame and sequence number.
 MockWrite CreateMockWrite(const SpdyFrame& req, int seq, IoMode mode) {
-  return MockWrite(
-      mode, req.data(), req.length() + SpdyFrame::kHeaderSize, seq);
+  return MockWrite(mode, req.data(), req.size(), seq);
 }
 
 // Create a MockRead from the given SpdyFrame.
 MockRead CreateMockRead(const SpdyFrame& resp) {
-  return MockRead(
-      ASYNC, resp.data(), resp.length() + SpdyFrame::kHeaderSize);
+  return MockRead(ASYNC, resp.data(), resp.size());
 }
 
 // Create a MockRead from the given SpdyFrame and sequence number.
@@ -870,8 +863,7 @@ MockRead CreateMockRead(const SpdyFrame& resp, int seq) {
 
 // Create a MockRead from the given SpdyFrame and sequence number.
 MockRead CreateMockRead(const SpdyFrame& resp, int seq, IoMode mode) {
-  return MockRead(
-      mode, resp.data(), resp.length() + SpdyFrame::kHeaderSize, seq);
+  return MockRead(mode, resp.data(), resp.size(), seq);
 }
 
 // Combines the given SpdyFrames into the given char array and returns
@@ -880,12 +872,12 @@ int CombineFrames(const SpdyFrame** frames, int num_frames,
                   char* buff, int buff_len) {
   int total_len = 0;
   for (int i = 0; i < num_frames; ++i) {
-    total_len += frames[i]->length() + SpdyFrame::kHeaderSize;
+    total_len += frames[i]->size();
   }
   DCHECK_LE(total_len, buff_len);
   char* ptr = buff;
   for (int i = 0; i < num_frames; ++i) {
-    int len = frames[i]->length() + SpdyFrame::kHeaderSize;
+    int len = frames[i]->size();
     memcpy(ptr, frames[i]->data(), len);
     ptr += len;
   }