Change SpdyFrameBuilder::length() to return size_t instead of int to avoid a bunch of static_casts in SpdyFramer.

Review URL: http://codereview.chromium.org/10162008

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@133321 0039d316-1c4b-4281-b951-d872f2087c98

3 files changed, 14 insertions, 14 deletions

diff --git a/net/spdy/spdy_frame_builder.h b/net/spdy/spdy_frame_builder.h
index 8391ba4..c5467e9 100644
--- a/net/spdy/spdy_frame_builder.h
+++ b/net/spdy/spdy_frame_builder.h
@@ -39,7 +39,7 @@ class NET_EXPORT_PRIVATE SpdyFrameBuilder {
   SpdyFrameBuilder(SpdyStreamId stream_id, SpdyDataFlags flags,  size_t size);
 
   // Returns the size of the SpdyFrameBuilder's data.
-  int length() const { return length_; }
+  size_t length() const { return length_; }
 
   // Takes the buffer from the SpdyFrameBuilder.
   SpdyFrame* take() {
diff --git a/net/spdy/spdy_framer.cc b/net/spdy/spdy_framer.cc
index 8dc6ff4..57cc48b 100644
--- a/net/spdy/spdy_framer.cc
+++ b/net/spdy/spdy_framer.cc
@@ -1051,7 +1051,7 @@ SpdySynStreamControlFrame* SpdyFramer::CreateSynStream(
   frame.WriteUInt8(priority << ((spdy_version_ < 3) ? 6 : 5));
   frame.WriteUInt8((spdy_version_ < 3) ? 0 : credential_slot);
   WriteHeaderBlock(&frame, headers);
-  DCHECK_EQ(static_cast<size_t>(frame.length()), frame_size);
+  DCHECK_EQ(frame.length(), frame_size);
 
   scoped_ptr<SpdySynStreamControlFrame> syn_frame(
       reinterpret_cast<SpdySynStreamControlFrame*>(frame.take()));
@@ -1084,7 +1084,7 @@ SpdySynReplyControlFrame* SpdyFramer::CreateSynReply(
     frame.WriteUInt16(0);  // Unused
   }
   WriteHeaderBlock(&frame, headers);
-  DCHECK_EQ(static_cast<size_t>(frame.length()), frame_size);
+  DCHECK_EQ(frame.length(), frame_size);
 
   scoped_ptr<SpdySynReplyControlFrame> reply_frame(
       reinterpret_cast<SpdySynReplyControlFrame*>(frame.take()));
@@ -1108,7 +1108,7 @@ SpdyRstStreamControlFrame* SpdyFramer::CreateRstStream(
                          frame_size);
   frame.WriteUInt32(stream_id);
   frame.WriteUInt32(status);
-  DCHECK_EQ(static_cast<size_t>(frame.length()), frame_size);
+  DCHECK_EQ(frame.length(), frame_size);
   return reinterpret_cast<SpdyRstStreamControlFrame*>(frame.take());
 }
 
@@ -1126,7 +1126,7 @@ SpdySettingsControlFrame* SpdyFramer::CreateSettings(
     frame.WriteUInt32(it->second.second);
     ++it;
   }
-  DCHECK_EQ(static_cast<size_t>(frame.length()), frame_size);
+  DCHECK_EQ(frame.length(), frame_size);
   return reinterpret_cast<SpdySettingsControlFrame*>(frame.take());
 }
 
@@ -1134,7 +1134,7 @@ SpdyPingControlFrame* SpdyFramer::CreatePingFrame(uint32 unique_id) const {
   size_t frame_size = SpdyPingControlFrame::size();
   SpdyFrameBuilder frame(PING, CONTROL_FLAG_NONE, spdy_version_, frame_size);
   frame.WriteUInt32(unique_id);
-  DCHECK_EQ(static_cast<size_t>(frame.length()), frame_size);
+  DCHECK_EQ(frame.length(), frame_size);
   return reinterpret_cast<SpdyPingControlFrame*>(frame.take());
 }
 
@@ -1153,7 +1153,7 @@ SpdyGoAwayControlFrame* SpdyFramer::CreateGoAway(
   if (protocol_version() >= 3) {
     frame.WriteUInt32(status);
   }
-  DCHECK_EQ(static_cast<size_t>(frame.length()), frame_size);
+  DCHECK_EQ(frame.length(), frame_size);
   return reinterpret_cast<SpdyGoAwayControlFrame*>(frame.take());
 }
 
@@ -1180,7 +1180,7 @@ SpdyHeadersControlFrame* SpdyFramer::CreateHeaders(
     frame.WriteUInt16(0);  // Unused
   }
   WriteHeaderBlock(&frame, headers);
-  DCHECK_EQ(static_cast<size_t>(frame.length()), frame_size);
+  DCHECK_EQ(frame.length(), frame_size);
 
   scoped_ptr<SpdyHeadersControlFrame> headers_frame(
       reinterpret_cast<SpdyHeadersControlFrame*>(frame.take()));
@@ -1205,7 +1205,7 @@ SpdyWindowUpdateControlFrame* SpdyFramer::CreateWindowUpdate(
                          frame_size);
   frame.WriteUInt32(stream_id);
   frame.WriteUInt32(delta_window_size);
-  DCHECK_EQ(static_cast<size_t>(frame.length()), frame_size);
+  DCHECK_EQ(frame.length(), frame_size);
   return reinterpret_cast<SpdyWindowUpdateControlFrame*>(frame.take());
 }
 
@@ -1234,7 +1234,7 @@ SpdyCredentialControlFrame* SpdyFramer::CreateCredentialFrame(
     frame.WriteUInt32(cert->length());
     frame.WriteBytes(cert->c_str(), cert->length());
   }
-  DCHECK_EQ(static_cast<size_t>(frame.length()), frame_size);
+  DCHECK_EQ(frame.length(), frame_size);
   return reinterpret_cast<SpdyCredentialControlFrame*>(frame.take());
 }
 
@@ -1246,7 +1246,7 @@ SpdyDataFrame* SpdyFramer::CreateDataFrame(SpdyStreamId stream_id,
   size_t frame_size = SpdyDataFrame::size() + len;
   SpdyFrameBuilder frame(stream_id, flags, frame_size);
   frame.WriteBytes(data, len);
-  DCHECK_EQ(static_cast<size_t>(frame.length()), frame_size);
+  DCHECK_EQ(frame.length(), frame_size);
   return reinterpret_cast<SpdyDataFrame*>(frame.take());
 }
 
diff --git a/net/spdy/spdy_framer_test.cc b/net/spdy/spdy_framer_test.cc
index b03fcb8..9279539 100644
--- a/net/spdy/spdy_framer_test.cc
+++ b/net/spdy/spdy_framer_test.cc
@@ -453,12 +453,12 @@ using test::TestSpdyVisitor;
 TEST(SpdyFrameBuilderTest, WriteLimits) {
   SpdyFrameBuilder builder(1, DATA_FLAG_NONE, kLengthMask + 8);
   // Data frame header is 8 bytes
-  EXPECT_EQ(8, builder.length());
+  EXPECT_EQ(8u, builder.length());
   const std::string kLargeData(kLengthMask, 'A');
   builder.WriteUInt32(kLengthMask);
-  EXPECT_EQ(12, builder.length());
+  EXPECT_EQ(12u, builder.length());
   EXPECT_TRUE(builder.WriteBytes(kLargeData.data(), kLengthMask - 4));
-  EXPECT_EQ(kLengthMask + 8, static_cast<unsigned>(builder.length()));
+  EXPECT_EQ(kLengthMask + 8, builder.length());
 }
 
 enum SpdyFramerTestTypes {