Remove many-many SpdyMajorVersion and NextProto arguments and members.

net/spdy/spdy_http_utils_unittest.cc

Index: net/spdy/spdy_http_utils_unittest.cc
diff --git a/net/spdy/spdy_http_utils_unittest.cc b/net/spdy/spdy_http_utils_unittest.cc
index a53e33145d284af138f07456e408f89e8fa44420..999a03a4454900d541e485b978f42f0f1178fc87 100644
--- a/net/spdy/spdy_http_utils_unittest.cc
+++ b/net/spdy/spdy_http_utils_unittest.cc
@@ -22,43 +22,26 @@ bool kDirect = true;
 }  // namespace
 
 TEST(SpdyHttpUtilsTest, ConvertRequestPriorityToSpdy3Priority) {
-  EXPECT_EQ(0, ConvertRequestPriorityToSpdyPriority(HIGHEST, SPDY3));
-  EXPECT_EQ(1, ConvertRequestPriorityToSpdyPriority(MEDIUM, SPDY3));
-  EXPECT_EQ(2, ConvertRequestPriorityToSpdyPriority(LOW, SPDY3));
-  EXPECT_EQ(3, ConvertRequestPriorityToSpdyPriority(LOWEST, SPDY3));
-  EXPECT_EQ(4, ConvertRequestPriorityToSpdyPriority(IDLE, SPDY3));
+  EXPECT_EQ(0, ConvertRequestPriorityToSpdyPriority(HIGHEST));
+  EXPECT_EQ(1, ConvertRequestPriorityToSpdyPriority(MEDIUM));
+  EXPECT_EQ(2, ConvertRequestPriorityToSpdyPriority(LOW));
+  EXPECT_EQ(3, ConvertRequestPriorityToSpdyPriority(LOWEST));
+  EXPECT_EQ(4, ConvertRequestPriorityToSpdyPriority(IDLE));
 }
 
 TEST(SpdyHttpUtilsTest, ConvertSpdy3PriorityToRequestPriority) {
-  EXPECT_EQ(HIGHEST, ConvertSpdyPriorityToRequestPriority(0, SPDY3));
-  EXPECT_EQ(MEDIUM, ConvertSpdyPriorityToRequestPriority(1, SPDY3));
-  EXPECT_EQ(LOW, ConvertSpdyPriorityToRequestPriority(2, SPDY3));
-  EXPECT_EQ(LOWEST, ConvertSpdyPriorityToRequestPriority(3, SPDY3));
-  EXPECT_EQ(IDLE, ConvertSpdyPriorityToRequestPriority(4, SPDY3));
+  EXPECT_EQ(HIGHEST, ConvertSpdyPriorityToRequestPriority(0));
+  EXPECT_EQ(MEDIUM, ConvertSpdyPriorityToRequestPriority(1));
+  EXPECT_EQ(LOW, ConvertSpdyPriorityToRequestPriority(2));
+  EXPECT_EQ(LOWEST, ConvertSpdyPriorityToRequestPriority(3));
+  EXPECT_EQ(IDLE, ConvertSpdyPriorityToRequestPriority(4));
   // These are invalid values, but we should still handle them
   // gracefully.
   for (int i = 5; i < std::numeric_limits<uint8_t>::max(); ++i) {
-    EXPECT_EQ(IDLE, ConvertSpdyPriorityToRequestPriority(i, SPDY3));
+    EXPECT_EQ(IDLE, ConvertSpdyPriorityToRequestPriority(i));
   }
 }
 
-TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestSPDY3) {
-  GURL url("https://www.google.com/index.html");
-  HttpRequestInfo request;
-  request.method = "GET";
-  request.url = url;
-  request.extra_headers.SetHeader(HttpRequestHeaders::kUserAgent, "Chrome/1.1");
-  SpdyHeaderBlock headers;
-  CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, SPDY3,
-                                   kDirect, &headers);
-  EXPECT_EQ("GET", headers[":method"]);
-  EXPECT_EQ("https", headers[":scheme"]);
-  EXPECT_EQ("www.google.com", headers[":host"]);
-  EXPECT_EQ("/index.html", headers[":path"]);
-  EXPECT_EQ("HTTP/1.1", headers[":version"]);
-  EXPECT_EQ("Chrome/1.1", headers["user-agent"]);
-}
-
 TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestHTTP2) {
   GURL url("https://www.google.com/index.html");
   HttpRequestInfo request;
@@ -66,8 +49,8 @@ TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestHTTP2) {
   request.url = url;
   request.extra_headers.SetHeader(HttpRequestHeaders::kUserAgent, "Chrome/1.1");
   SpdyHeaderBlock headers;
-  CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, HTTP2,
-                                   kDirect, &headers);
+  CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, kDirect,
+                                   &headers);
   EXPECT_EQ("GET", headers[":method"]);
   EXPECT_EQ("https", headers[":scheme"]);
   EXPECT_EQ("www.google.com", headers[":authority"]);
@@ -76,23 +59,6 @@ TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestHTTP2) {
   EXPECT_EQ("Chrome/1.1", headers["user-agent"]);
 }
 
-TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestProxySPDY3) {
-  GURL url("https://www.google.com/index.html");
-  HttpRequestInfo request;
-  request.method = "GET";
-  request.url = url;
-  request.extra_headers.SetHeader(HttpRequestHeaders::kUserAgent, "Chrome/1.1");
-  SpdyHeaderBlock headers;
-  CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, SPDY3,
-                                   !kDirect, &headers);
-  EXPECT_EQ("GET", headers[":method"]);
-  EXPECT_EQ("https", headers[":scheme"]);
-  EXPECT_EQ("www.google.com", headers[":host"]);
-  EXPECT_EQ("/index.html", headers[":path"]);
-  EXPECT_EQ("HTTP/1.1", headers[":version"]);
-  EXPECT_EQ("Chrome/1.1", headers["user-agent"]);
-}
-
 TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestProxyHTTP2) {
   GURL url("https://www.google.com/index.html");
   HttpRequestInfo request;
@@ -100,8 +66,8 @@ TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestProxyHTTP2) {
   request.url = url;
   request.extra_headers.SetHeader(HttpRequestHeaders::kUserAgent, "Chrome/1.1");
   SpdyHeaderBlock headers;
-  CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, HTTP2,
-                                   !kDirect, &headers);
+  CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, !kDirect,
+                                   &headers);
   EXPECT_EQ("GET", headers[":method"]);
   EXPECT_EQ("https", headers[":scheme"]);
   EXPECT_EQ("www.google.com", headers[":authority"]);
@@ -110,23 +76,6 @@ TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestProxyHTTP2) {
   EXPECT_EQ("Chrome/1.1", headers["user-agent"]);
 }
 
-TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestConnectSPDY3) {
-  GURL url("https://www.google.com/index.html");
-  HttpRequestInfo request;
-  request.method = "CONNECT";
-  request.url = url;
-  request.extra_headers.SetHeader(HttpRequestHeaders::kUserAgent, "Chrome/1.1");
-  SpdyHeaderBlock headers;
-  CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, SPDY3,
-                                   kDirect, &headers);
-  EXPECT_EQ("CONNECT", headers[":method"]);
-  EXPECT_TRUE(headers.end() == headers.find(":scheme"));
-  EXPECT_EQ("www.google.com", headers[":host"]);
-  EXPECT_EQ("www.google.com:443", headers[":path"]);
-  EXPECT_EQ("HTTP/1.1", headers[":version"]);
-  EXPECT_EQ("Chrome/1.1", headers["user-agent"]);
-}
-
 TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestConnectHTTP2) {
   GURL url("https://www.google.com/index.html");
   HttpRequestInfo request;
@@ -134,8 +83,8 @@ TEST(SpdyHttpUtilsTest, CreateSpdyHeadersFromHttpRequestConnectHTTP2) {
   request.url = url;
   request.extra_headers.SetHeader(HttpRequestHeaders::kUserAgent, "Chrome/1.1");
   SpdyHeaderBlock headers;
-  CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, HTTP2,
-                                   kDirect, &headers);
+  CreateSpdyHeadersFromHttpRequest(request, request.extra_headers, kDirect,
+                                   &headers);
   EXPECT_EQ("CONNECT", headers[":method"]);
   EXPECT_TRUE(headers.end() == headers.find(":scheme"));
   EXPECT_EQ("www.google.com:443", headers[":authority"]);