Use HttpRequestHeaders for extra_headers.

net/http/http_request_info.h

Index: net/http/http_request_info.h
diff --git a/net/http/http_request_info.h b/net/http/http_request_info.h
index 7ada539168f2b261aa735cb677947f50cfc1ef78..c36e21a51f56fced08638a454028da3eb7da99ac 100644
--- a/net/http/http_request_info.h
+++ b/net/http/http_request_info.h
@@ -10,10 +10,11 @@
 #include "googleurl/src/gurl.h"
 #include "net/base/request_priority.h"
 #include "net/base/upload_data.h"
+#include "net/http/http_request_headers.h"
 
 namespace net {
 
-class HttpRequestInfo {
+struct HttpRequestInfo {
  public:
   HttpRequestInfo() : load_flags(0), priority(LOWEST) {
   }
@@ -27,12 +28,8 @@ class HttpRequestInfo {
   // The method to use (GET, POST, etc.).
   std::string method;
 
-  // The user agent string to use.  TODO(darin): we should just add this to
-  // extra_headers
-  std::string user_agent;
-
-  // Any extra request headers (\r\n-delimited).
-  std::string extra_headers;
+  // Any extra request headers (including User-Agent).
+  HttpRequestHeaders extra_headers;
 
   // Any upload data.
   scoped_refptr<UploadData> upload_data;