Remove usage of BalsaHeaders from QuicClient. Also move QuicDataToResend from QuicClient to QuicCli…

net/tools/quic/spdy_balsa_utils.cc

Index: net/tools/quic/spdy_balsa_utils.cc
diff --git a/net/tools/quic/spdy_balsa_utils.cc b/net/tools/quic/spdy_balsa_utils.cc
index faccce1e18f516e67c64c74a0063d22bd5526f75..b5764208990f8cf298b4e0fddfa18662dd36e8de 100644
--- a/net/tools/quic/spdy_balsa_utils.cc
+++ b/net/tools/quic/spdy_balsa_utils.cc
@@ -189,25 +189,29 @@ void SpdyHeadersToRequestHeaders(const SpdyHeaderBlock& header_block,
     method = method_it->second.as_string();
   }
   string uri;
-  if (path_it == end_it) {
-    uri = "/";
-  } else {
-    uri = path_it->second.as_string();
-  }
-  request_headers->SetRequestFirstlineFromStringPieces(
-      method, uri, net::kHttp2VersionString);
-
   if (scheme_it == end_it) {
-    request_headers->AppendHeader("Scheme", "https");
+    uri += "https";
   } else {
-    request_headers->AppendHeader("Scheme", scheme_it->second);
+    uri += scheme_it->second.as_string();
   }
+  uri += "://";
+
   if (authority_it != end_it) {
+    uri += authority_it->second.as_string();
     request_headers->AppendHeader("host", authority_it->second);
   } else if (host_it != end_it) {
+    uri += host_it->second.as_string();
     request_headers->AppendHeader("host", host_it->second);
   }
 
+  if (path_it == end_it) {
+    uri += "/";
+  } else {
+    uri += path_it->second.as_string();
+  }
+  request_headers->SetRequestFirstlineFromStringPieces(
+      method, uri, net::kHttp2VersionString);
+
   for (BlockIt it = header_block.begin(); it != header_block.end(); ++it) {
     if (!IsSpecialSpdyHeader(it, request_headers)) {
       if (it->second.empty()) {