Minor cleanup of QuicSpdyServerStream and QuicSpdyClientStream.

net/tools/quic/quic_spdy_server_stream_test.cc

Index: net/tools/quic/quic_spdy_server_stream_test.cc
diff --git a/net/tools/quic/quic_spdy_server_stream_test.cc b/net/tools/quic/quic_spdy_server_stream_test.cc
index eaf6d905d1ff07e45d755ab84b3f860ab5c9be15..ad67f0fdc7aa7d53b63f5717809f9f5cd4b97f57 100644
--- a/net/tools/quic/quic_spdy_server_stream_test.cc
+++ b/net/tools/quic/quic_spdy_server_stream_test.cc
@@ -37,11 +37,25 @@ namespace net {
 namespace tools {
 namespace test {
 
-class QuicSpdyServerStreamPeer {
+class QuicSpdyServerStreamPeer : public QuicSpdyServerStream {
  public:
-  static BalsaHeaders* GetMutableHeaders(
-      QuicSpdyServerStream* stream) {
-    return &(stream->headers_);
+  QuicSpdyServerStreamPeer(QuicStreamId stream_id, QuicSession* session)
+      : QuicSpdyServerStream(stream_id, session) {
+  }
+
+  using QuicSpdyServerStream::SendResponse;
+  using QuicSpdyServerStream::SendErrorResponse;
+
+  const string& body() {
+    return body_;
+  }
+
+  const BalsaHeaders& headers() {
+    return headers_;
+  }
+
+  BalsaHeaders* mutable_headers() {
+    return &headers_;
   }
 };
 
@@ -58,7 +72,7 @@ class QuicSpdyServerStreamTest : public ::testing::Test {
     request_headers.ReplaceOrAppendHeader("content-length", "11");
 
     headers_string_ = SpdyUtils::SerializeRequestHeaders(request_headers);
-    stream_.reset(new QuicSpdyServerStream(3, &session_));
+    stream_.reset(new QuicSpdyServerStreamPeer(3, &session_));
   }
 
   QuicConsumedData ValidateHeaders(const struct iovec* iov) {
@@ -119,7 +133,7 @@ class QuicSpdyServerStreamTest : public ::testing::Test {
   BalsaHeaders response_headers_;
   EpollServer eps_;
   StrictMock<MockSession> session_;
-  scoped_ptr<QuicSpdyServerStream> stream_;
+  scoped_ptr<QuicSpdyServerStreamPeer> stream_;
   string headers_string_;
   string body_;
 };
@@ -184,8 +198,7 @@ TEST_F(QuicSpdyServerStreamTest, TestFramingExtraData) {
 }
 
 TEST_F(QuicSpdyServerStreamTest, TestSendResponse) {
-  BalsaHeaders* request_headers =
-      QuicSpdyServerStreamPeer::GetMutableHeaders(stream_.get());
+  BalsaHeaders* request_headers = stream_->mutable_headers();
   request_headers->SetRequestFirstlineFromStringPieces(
       "GET",
       "https://www.google.com/foo",