Landing Recent QUIC changes until 10:38 AM, Oct 17, 2016 UTC-4

net/tools/quic/quic_spdy_client_stream_test.cc

Index: net/tools/quic/quic_spdy_client_stream_test.cc
diff --git a/net/tools/quic/quic_spdy_client_stream_test.cc b/net/tools/quic/quic_spdy_client_stream_test.cc
index 20f524a2ba1a22890b75eca50f4657f81b061839..1248831062e21ac0419a0e7a43a081154eadf75f 100644
--- a/net/tools/quic/quic_spdy_client_stream_test.cc
+++ b/net/tools/quic/quic_spdy_client_stream_test.cc
@@ -13,7 +13,6 @@
 #include "net/quic/test_tools/crypto_test_utils.h"
 #include "net/quic/test_tools/quic_test_utils.h"
 #include "net/tools/quic/quic_client_session.h"
-#include "net/tools/quic/spdy_balsa_utils.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 
@@ -69,10 +68,9 @@ class QuicSpdyClientStreamTest : public ::testing::Test {
         body_("hello world") {
     session_.Initialize();
 
-    headers_.SetResponseFirstlineFromStringPieces("HTTP/1.1", "200", "Ok");
-    headers_.ReplaceOrAppendHeader("content-length", "11");
-
-    headers_string_ = net::SpdyBalsaUtils::SerializeResponseHeaders(headers_);
+    headers_[":status"] = "200";
+    headers_["content-length"] = "11";
+    headers_string_ = SpdyUtils::SerializeUncompressedHeaders(headers_);
 
     stream_.reset(new QuicSpdyClientStream(kClientDataStreamId1, &session_));
     stream_visitor_.reset(new StreamVisitor());
@@ -93,14 +91,14 @@ class QuicSpdyClientStreamTest : public ::testing::Test {
   MockQuicClientSession session_;
   std::unique_ptr<QuicSpdyClientStream> stream_;
   std::unique_ptr<StreamVisitor> stream_visitor_;
-  BalsaHeaders headers_;
+  SpdyHeaderBlock headers_;
   string headers_string_;
   string body_;
 };
 
 TEST_F(QuicSpdyClientStreamTest, TestReceivingIllegalResponseStatusCode) {
-  headers_.ReplaceOrAppendHeader(":status", "200 ok");
-  headers_string_ = SpdyBalsaUtils::SerializeResponseHeaders(headers_);
+  headers_[":status"] = "200 ok";
+  headers_string_ = SpdyUtils::SerializeUncompressedHeaders(headers_);
 
   stream_->OnStreamHeaders(headers_string_);
   EXPECT_CALL(*connection_,