Switch CreateSpdyHeadersFromHttpRequest to construct the correct headers based on the spdy protocol…

net/spdy/spdy_network_transaction_spdy3_unittest.cc

 // Copyright (c) 2012 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/http/http_network_transaction.h"
 
 #include <string>
 #include <vector>
 
 #include "base/bind.h"
@@ skipping 1441 matching lines @@
     0,                            // Associated stream ID
     net::ConvertRequestPriorityToSpdyPriority(LOWEST),  // Priority
     spdy::CONTROL_FLAG_FIN,       // Control Flags
     false,                        // Compressed
     spdy::INVALID,                // Status
     NULL,                         // Data
     0,                            // Length
     spdy::DATA_FLAG_NONE          // Data Flags
   };
   const char* const kPutHeaders[] = {
-    "method", "PUT",
-    "url", "/",
-    "host", "www.google.com",
-    "scheme", "http",
-    "version", "HTTP/1.1",
+    ":method", "PUT",
+    ":path", "/",
+    ":host", "www.google.com",
+    ":scheme", "http",
+    ":version", "HTTP/1.1",
     "content-length", "0"
   };
   scoped_ptr<spdy::SpdyFrame> req(ConstructSpdyPacket(kSynStartHeader, NULL, 0,
     kPutHeaders, arraysize(kPutHeaders) / 2));
   MockWrite writes[] = {
     CreateMockWrite(*req)
   };
 
   scoped_ptr<spdy::SpdyFrame> body(ConstructSpdyBodyFrame(1, true));
   const SpdyHeaderInfo kSynReplyHeader = {
@@ skipping 46 matching lines @@
     0,                            // Associated stream ID
     net::ConvertRequestPriorityToSpdyPriority(LOWEST),  // Priority
     spdy::CONTROL_FLAG_FIN,       // Control Flags
     false,                        // Compressed
     spdy::INVALID,                // Status
     NULL,                         // Data
     0,                            // Length
     spdy::DATA_FLAG_NONE          // Data Flags
   };
   const char* const kHeadHeaders[] = {
-    "method", "HEAD",
-    "url", "/",
-    "host", "www.google.com",
-    "scheme", "http",
-    "version", "HTTP/1.1",
+    ":method", "HEAD",
+    ":path", "/",
+    ":host", "www.google.com",
+    ":scheme", "http",
+    ":version", "HTTP/1.1",
     "content-length", "0"
   };
   scoped_ptr<spdy::SpdyFrame> req(ConstructSpdyPacket(kSynStartHeader, NULL, 0,
     kHeadHeaders, arraysize(kHeadHeaders) / 2));
   MockWrite writes[] = {
     CreateMockWrite(*req)
   };
 
   scoped_ptr<spdy::SpdyFrame> body(ConstructSpdyBodyFrame(1, true));
   const SpdyHeaderInfo kSynReplyHeader = {
@@ skipping 879 matching lines @@
 
 // Send a spdy request to www.google.com that gets redirected to www.foo.com.
 TEST_P(SpdyNetworkTransactionSpdy3Test, RedirectGetRequest) {
   // These are headers which the net::URLRequest tacks on.
   const char* const kExtraHeaders[] = {
     "accept-encoding",
     "gzip,deflate",
   };
   const SpdyHeaderInfo kSynStartHeader = MakeSpdyHeader(spdy::SYN_STREAM);
   const char* const kStandardGetHeaders[] = {
-    "host",
+    ":host",
     "www.google.com",
-    "method",
+    ":method",
     "GET",
-    "scheme",
+    ":scheme",
     "http",
-    "url",
+    ":path",
     "/",
     "user-agent",
     "",
-    "version",
+    ":version",
     "HTTP/1.1"
   };
   const char* const kStandardGetHeaders2[] = {
-    "host",
+    ":host",
     "www.foo.com",
-    "method",
+    ":method",
     "GET",
-    "scheme",
+    ":scheme",
     "http",
-    "url",
+    ":path",
     "/index.php",
     "user-agent",
     "",
-    "version",
+    ":version",
     "HTTP/1.1"
   };
 
   // Setup writes/reads to www.google.com
   scoped_ptr<spdy::SpdyFrame> req(ConstructSpdyPacket(
       kSynStartHeader, kExtraHeaders, arraysize(kExtraHeaders) / 2,
       kStandardGetHeaders, arraysize(kStandardGetHeaders) / 2));
   scoped_ptr<spdy::SpdyFrame> req2(ConstructSpdyPacket(
       kSynStartHeader, kExtraHeaders, arraysize(kExtraHeaders) / 2,
       kStandardGetHeaders2, arraysize(kStandardGetHeaders2) / 2));
@@ skipping 191 matching lines @@
 // Send a spdy request to www.google.com. Get a pushed stream that redirects to
 // www.foo.com.
 TEST_P(SpdyNetworkTransactionSpdy3Test, RedirectServerPush) {
   // These are headers which the net::URLRequest tacks on.
   const char* const kExtraHeaders[] = {
     "accept-encoding",
     "gzip,deflate",
   };
   const SpdyHeaderInfo kSynStartHeader = MakeSpdyHeader(spdy::SYN_STREAM);
   const char* const kStandardGetHeaders[] = {
-    "host",
+    ":host",
     "www.google.com",
-    "method",
+    ":method",
     "GET",
-    "scheme",
+    ":scheme",
     "http",
-    "url",
+    ":path",
     "/",
     "user-agent",
     "",
-    "version",
+    ":version",
     "HTTP/1.1"
   };
 
   // Setup writes/reads to www.google.com
   scoped_ptr<spdy::SpdyFrame> req(
       ConstructSpdyPacket(kSynStartHeader,
                           kExtraHeaders,
                           arraysize(kExtraHeaders) / 2,
                           kStandardGetHeaders,
                           arraysize(kStandardGetHeaders) / 2));
@@ skipping 15 matching lines @@
   MockRead reads[] = {
     CreateMockRead(*resp, 2),
     CreateMockRead(*rep, 3),
     CreateMockRead(*body, 4),
     MockRead(ASYNC, ERR_IO_PENDING, 5),  // Force a pause
     MockRead(ASYNC, 0, 0, 7)  // EOF
   };
 
   // Setup writes/reads to www.foo.com
   const char* const kStandardGetHeaders2[] = {
-    "host",
+    ":host",
     "www.foo.com",
-    "method",
+    ":method",
     "GET",
-    "scheme",
+    ":scheme",
     "http",
-    "url",
+    ":path",
     "/index.php",
     "user-agent",
     "",
-    "version",
+    ":version",
     "HTTP/1.1"
   };
   scoped_ptr<spdy::SpdyFrame> req2(
       ConstructSpdyPacket(kSynStartHeader,
                           kExtraHeaders,
                           arraysize(kExtraHeaders) / 2,
                           kStandardGetHeaders2,
                           arraysize(kStandardGetHeaders2) / 2));
   scoped_ptr<spdy::SpdyFrame> resp2(ConstructSpdyGetSynReply(NULL, 0, 1));
   scoped_ptr<spdy::SpdyFrame> body2(ConstructSpdyBodyFrame(1, true));
@@ skipping 1158 matching lines @@
       entries, 0,
       net::NetLog::TYPE_SPDY_SESSION_SYN_STREAM,
       net::NetLog::PHASE_NONE);
   CapturingNetLog::Entry entry = entries[pos];
   NetLogSpdySynParameter* request_params =
       static_cast<NetLogSpdySynParameter*>(entry.extra_parameters.get());
   spdy::SpdyHeaderBlock* headers =
       request_params->GetHeaders().get();
 
   spdy::SpdyHeaderBlock expected;
-  expected["host"] = "www.google.com";
-  expected["url"] = "/";
-  expected["scheme"] = "http";
-  expected["version"] = "HTTP/1.1";
-  expected["method"] = "GET";
+  expected[":host"] = "www.google.com";
+  expected[":path"] = "/";
+  expected[":scheme"] = "http";
+  expected[":version"] = "HTTP/1.1";
+  expected[":method"] = "GET";
   expected["user-agent"] = "Chrome";
   EXPECT_EQ(expected.size(), headers->size());
   spdy::SpdyHeaderBlock::const_iterator end = expected.end();
   for (spdy::SpdyHeaderBlock::const_iterator it = expected.begin();
       it != end;
       ++it) {
     EXPECT_EQ(it->second, (*headers)[it->first]);
   }
 }
 
@@ skipping 1939 matching lines @@
                                     << " Write index: "
                                     << data->write_index();
 
   // Verify the SYN_REPLY.
   HttpResponseInfo response = *trans->GetResponseInfo();
   EXPECT_TRUE(response.headers != NULL);
   EXPECT_EQ("HTTP/1.1 200 OK", response.headers->GetStatusLine());
 }
 
 }  // namespace net