Use HttpRequestHeaders for extra_headers.

net/spdy/spdy_session.cc

 // Copyright (c) 2010 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/spdy/spdy_session.h"
 
 #include "base/basictypes.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
 #include "base/rand_util.h"
@@ skipping 114 matching lines @@
 
   response->headers = new HttpResponseHeaders(raw_headers);
   response->was_fetched_via_spdy = true;
   return true;
 }
 
 // Create a SpdyHeaderBlock for a Spdy SYN_STREAM Frame from
 // a HttpRequestInfo block.
 void CreateSpdyHeadersFromHttpRequest(
     const HttpRequestInfo& info, spdy::SpdyHeaderBlock* headers) {
+  // TODO(willchan): It's not really necessary to convert from
+  // HttpRequestHeaders to spdy::SpdyHeaderBlock.
+
   static const char kHttpProtocolVersion[] = "HTTP/1.1";
 
-  HttpUtil::HeadersIterator it(info.extra_headers.begin(),
-                               info.extra_headers.end(),
-                               "\r\n");
+  HttpRequestHeaders::Iterator it(info.extra_headers);
+
   while (it.GetNext()) {
     std::string name = StringToLowerASCII(it.name());
     if (headers->find(name) == headers->end()) {
-      (*headers)[name] = it.values();
+      (*headers)[name] = it.value();
     } else {
       std::string new_value = (*headers)[name];
       new_value.append(1, '\0');  // +=() doesn't append 0's
-      new_value += it.values();
+      new_value += it.value();
       (*headers)[name] = new_value;
     }
   }
 
   // TODO(mbelshe): Add Proxy headers here. (See http_network_transaction.cc)
   // TODO(mbelshe): Add authentication headers here.
 
   (*headers)["method"] = info.method;
   (*headers)["url"] = info.url.spec();
   (*headers)["version"] = kHttpProtocolVersion;
-  if (info.user_agent.length())
-    (*headers)["user-agent"] = info.user_agent;
   if (!info.referrer.is_empty())
     (*headers)["referer"] = info.referrer.spec();
 
   // Honor load flags that impact proxy caches.
   if (info.load_flags & LOAD_BYPASS_CACHE) {
     (*headers)["pragma"] = "no-cache";
     (*headers)["cache-control"] = "no-cache";
   } else if (info.load_flags & LOAD_VALIDATE_CACHE) {
     (*headers)["cache-control"] = "max-age=0";
   }
@@ skipping 922 matching lines @@
 
   // TODO(willchan): Cancel any streams that are past the GoAway frame's
   // |last_accepted_stream_id|.
 
   // Don't bother killing any streams that are still reading.  They'll either
   // complete successfully or get an ERR_CONNECTION_CLOSED when the socket is
   // closed.
 }
 
 }  // namespace net