Remove Balsa from QuicSpdyClientStream.

net/tools/quic/test_tools/quic_test_client.cc

Index: net/tools/quic/test_tools/quic_test_client.cc
diff --git a/net/tools/quic/test_tools/quic_test_client.cc b/net/tools/quic/test_tools/quic_test_client.cc
index 94d55b4a564af44aa4d12dc70ee4e1ac1ca5c9f5..4bb9f86c24e28261c7467450abab9e88f6ca60fd 100644
--- a/net/tools/quic/test_tools/quic_test_client.cc
+++ b/net/tools/quic/test_tools/quic_test_client.cc
@@ -19,6 +19,7 @@
 #include "net/tools/quic/quic_epoll_connection_helper.h"
 #include "net/tools/quic/quic_packet_writer_wrapper.h"
 #include "net/tools/quic/quic_spdy_client_stream.h"
+#include "net/tools/quic/spdy_utils.h"
 #include "net/tools/quic/test_tools/http_message.h"
 #include "net/tools/quic/test_tools/quic_client_peer.h"
 #include "url/gurl.h"
@@ -255,7 +256,8 @@ ssize_t QuicTestClient::SendMessage(const HTTPMessage& message) {
   scoped_ptr<BalsaHeaders> munged_headers(MungeHeaders(message.headers(),
                                           secure_));
   ssize_t ret = GetOrCreateStream()->SendRequest(
-      munged_headers.get() ? *munged_headers : *message.headers(),
+      SpdyUtils::RequestHeadersToSpdyHeaders(
+          munged_headers.get() ? *munged_headers : *message.headers()),
       message.body(), message.has_complete_message());
   WaitForWriteToFlush();
   return ret;
@@ -463,7 +465,8 @@ bool QuicTestClient::response_headers_complete() const {
 
 const BalsaHeaders* QuicTestClient::response_headers() const {
   if (stream_ != nullptr) {
-    return &stream_->headers();
+    SpdyUtils::SpdyHeadersToResponseHeaders(stream_->headers(), &headers_);
+    return &headers_;
   } else {

[ramant (doing other things), 2015/03/25 21:06:21]

overly nit: could "return ... } else {" be deleted?

if (stream_ != nullptr) {
  SpdyUtils::SpdyHeadersToResponseHeaders(stream_->headers(), &headers_);
}
return &headers_;

[Ryan Hamilton, 2015/03/25 21:37:43]

Done.

     return &headers_;
   }
@@ -491,7 +494,8 @@ void QuicTestClient::OnClose(QuicDataStream* stream) {
   }
   response_complete_ = true;
   response_headers_complete_ = stream_->headers_decompressed();
-  headers_.CopyFrom(stream_->headers());
+  SpdyUtils::SpdyHeadersToResponseHeaders(stream_->headers(),
+                                          &headers_);
   stream_error_ = stream_->stream_error();
   bytes_read_ = stream_->stream_bytes_read() + stream_->header_bytes_read();
   bytes_written_ =