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

net/quic/core/spdy_utils_test.cc

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 #include "net/quic/core/spdy_utils.h"
 
 #include "base/macros.h"
 #include "base/strings/string_number_conversions.h"
 #include "base/strings/string_piece.h"
 #include "net/test/gtest_util.h"
 
@@ skipping 335 matching lines @@
   headers["key2"] = "value2";
   EXPECT_EQ(SpdyUtils::GetHostNameFromHeaderBlock(headers), "www.google.com");
   headers[":authority"] = "www.google.com:6666";
   EXPECT_EQ(SpdyUtils::GetHostNameFromHeaderBlock(headers), "www.google.com");
   headers[":authority"] = "192.168.1.1";
   EXPECT_EQ(SpdyUtils::GetHostNameFromHeaderBlock(headers), "192.168.1.1");
   headers[":authority"] = "192.168.1.1:6666";
   EXPECT_EQ(SpdyUtils::GetHostNameFromHeaderBlock(headers), "192.168.1.1");
 }
 
-TEST(SpdyUtilsTest, UrlIsValid) {
+TEST(SpdyUtilsTest, PopulateHeaderBlockFromUrl) {
+  string url = "https://www.google.com/index.html";
   SpdyHeaderBlock headers;
-  EXPECT_FALSE(SpdyUtils::UrlIsValid(headers));
-  headers[":scheme"] = "https";
-  EXPECT_FALSE(SpdyUtils::UrlIsValid(headers));
-  headers[":authority"] = "www.google.com";
-  EXPECT_FALSE(SpdyUtils::UrlIsValid(headers));
-  headers[":path"] = "/index.html";
-  EXPECT_TRUE(SpdyUtils::UrlIsValid(headers));
+  EXPECT_TRUE(SpdyUtils::PopulateHeaderBlockFromUrl(url, &headers));
+  EXPECT_EQ("https", headers[":scheme"].as_string());
+  EXPECT_EQ("www.google.com", headers[":authority"].as_string());
+  EXPECT_EQ("/index.html", headers[":path"].as_string());
+}
+
+TEST(SpdyUtilsTest, PopulateHeaderBlockFromUrlFails) {
+  SpdyHeaderBlock headers;
+  EXPECT_FALSE(SpdyUtils::PopulateHeaderBlockFromUrl("/", &headers));
+  EXPECT_FALSE(SpdyUtils::PopulateHeaderBlockFromUrl("/index.html", &headers));
+  EXPECT_FALSE(
+      SpdyUtils::PopulateHeaderBlockFromUrl("www.google.com/", &headers));
 }
 
 }  // namespace test
 }  // namespace net