Use HttpRequestHeaders for extra_headers.

net/http/http_request_headers.cc

Index: net/http/http_request_headers.cc
diff --git a/net/http/http_request_headers.cc b/net/http/http_request_headers.cc
index d894584cf9841c49e5b3a221492537717ca27b6d..43e620584b58d4be1a19ee84c3a5eeb86e644eab 100644
--- a/net/http/http_request_headers.cc
+++ b/net/http/http_request_headers.cc
@@ -11,29 +11,57 @@
 namespace net {
 
 const char HttpRequestHeaders::kGetMethod[] = "GET";
-
+const char HttpRequestHeaders::kAcceptCharset[] = "Accept-Charset";
+const char HttpRequestHeaders::kAcceptEncoding[] = "Accept-Encoding";
+const char HttpRequestHeaders::kAcceptLanguage[] = "Accept-Language";
 const char HttpRequestHeaders::kCacheControl[] = "Cache-Control";
 const char HttpRequestHeaders::kConnection[] = "Connection";
+const char HttpRequestHeaders::kCookie[] = "Cookie";
 const char HttpRequestHeaders::kContentLength[] = "Content-Length";
 const char HttpRequestHeaders::kHost[] = "Host";
+const char HttpRequestHeaders::kIfModifiedSince[] = "If-Modified-Since";
+const char HttpRequestHeaders::kIfNoneMatch[] = "If-None-Match";
+const char HttpRequestHeaders::kIfRange[] = "If-Range";
 const char HttpRequestHeaders::kPragma[] = "Pragma";
 const char HttpRequestHeaders::kProxyConnection[] = "Proxy-Connection";
+const char HttpRequestHeaders::kRange[] = "Range";
 const char HttpRequestHeaders::kReferer[] = "Referer";
 const char HttpRequestHeaders::kUserAgent[] = "User-Agent";
 
+HttpRequestHeaders::Iterator::Iterator(const HttpRequestHeaders& headers)
+    : started_(false),
+      curr_(headers.headers_.begin()),
+      end_(headers.headers_.end()) {}
+
+HttpRequestHeaders::Iterator::~Iterator() {}
+
+bool HttpRequestHeaders::Iterator::GetNext() {
+  if (!started_) {
+    started_ = true;
+    return curr_ != end_;
+  }
+
+  if (curr_ == end_)
+    return false;
+
+  ++curr_;
+  return curr_ != end_;
+}
+
 HttpRequestHeaders::HttpRequestHeaders() {}
 HttpRequestHeaders::~HttpRequestHeaders() {}
 
-void HttpRequestHeaders::SetRequestLine(const base::StringPiece& method,
-                                        const base::StringPiece& path,
-                                        const base::StringPiece& version) {
-  DCHECK(!method.empty());
-  DCHECK(!path.empty());
-  DCHECK(!version.empty());
+bool HttpRequestHeaders::GetHeader(const base::StringPiece& key,
+                                   std::string* out) const {
+  HeaderVector::const_iterator it = FindHeader(key);
+  if (it == headers_.end())
+    return false;
+  out->assign(it->value);
+  return true;
+}
 
-  method_.assign(method.data(), method.length());
-  path_.assign(path.data(), path.length());
-  version_.assign(version.data(), version.length());
+void HttpRequestHeaders::Clear() {
+  headers_.clear();
 }
 
 void HttpRequestHeaders::SetHeader(const base::StringPiece& key,
@@ -95,11 +123,20 @@ void HttpRequestHeaders::AddHeaderFromString(
   }
 }
 
-void HttpRequestHeaders::MergeFrom(const HttpRequestHeaders& other) {
-  DCHECK(other.method_.empty());
-  DCHECK(other.path_.empty());
-  DCHECK(other.version_.empty());
+void HttpRequestHeaders::AddHeadersFromString(
+    const base::StringPiece& headers) {
+  // TODO(willchan): Consider adding more StringPiece support in string_util.h
+  // to eliminate copies.
+  std::vector<std::string> header_line_vector;
+  SplitStringUsingSubstr(headers.as_string(), "\r\n", &header_line_vector);
+  for (std::vector<std::string>::const_iterator it = header_line_vector.begin();
+       it != header_line_vector.end(); ++it) {
+    if (!it->empty())
+      AddHeaderFromString(*it);
+  }
+}
 
+void HttpRequestHeaders::MergeFrom(const HttpRequestHeaders& other) {
   for (HeaderVector::const_iterator it = other.headers_.begin();
        it != other.headers_.end(); ++it ) {
     SetHeader(it->key, it->value);
@@ -108,12 +145,6 @@ void HttpRequestHeaders::MergeFrom(const HttpRequestHeaders& other) {
 
 std::string HttpRequestHeaders::ToString() const {
   std::string output;
-  if (!method_.empty()) {
-    DCHECK(!path_.empty());
-    DCHECK(!version_.empty());
-    output = StringPrintf(
-        "%s %s HTTP/%s\r\n", method_.c_str(), path_.c_str(), version_.c_str());
-  }
   for (HeaderVector::const_iterator it = headers_.begin();
        it != headers_.end(); ++it) {
     if (!it->value.empty())
@@ -137,4 +168,16 @@ HttpRequestHeaders::FindHeader(const base::StringPiece& key) {
   return headers_.end();
 }
 
+HttpRequestHeaders::HeaderVector::const_iterator
+HttpRequestHeaders::FindHeader(const base::StringPiece& key) const {
+  for (HeaderVector::const_iterator it = headers_.begin();
+       it != headers_.end(); ++it) {
+    if (key.length() == it->key.length() &&
+        !base::strncasecmp(key.data(), it->key.data(), key.length()))
+      return it;
+  }
+
+  return headers_.end();
+}
+
 }  // namespace net