Use HttpRequestHeaders for extra_headers.

net/http/http_vary_data.cc

 // Copyright (c) 2006-2008 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_vary_data.h"
 
 #include <stdlib.h>
 
 #include "base/pickle.h"
 #include "base/string_util.h"
+#include "net/http/http_request_headers.h"
 #include "net/http/http_request_info.h"
 #include "net/http/http_response_headers.h"
 #include "net/http/http_util.h"
 
 namespace net {
 
 HttpVaryData::HttpVaryData() : is_valid_(false) {
 }
 
 bool HttpVaryData::Init(const HttpRequestInfo& request_info,
@@ skipping 69 matching lines @@
   }
   return memcmp(&new_vary_data.request_digest_, &request_digest_,
                 sizeof(request_digest_)) == 0;
 }
 
 // static
 std::string HttpVaryData::GetRequestValue(
     const HttpRequestInfo& request_info,
     const std::string& request_header) {
   // Some special cases:
-  if (LowerCaseEqualsASCII(request_header, "referer"))
+  if (!base::strcasecmp(request_header.c_str(), HttpRequestHeaders::kReferer))
     return request_info.referrer.spec();
-  if (LowerCaseEqualsASCII(request_header, "user-agent"))
-    return request_info.user_agent;
-
-  std::string result;
-
-  // Check extra headers:
-  HttpUtil::HeadersIterator it(request_info.extra_headers.begin(),
-                               request_info.extra_headers.end(),
-                               "\r\n");
-  while (it.GetNext()) {
-    size_t name_len = it.name_end() - it.name_begin();
-    if (request_header.size() == name_len &&
-        std::equal(it.name_begin(), it.name_end(), request_header.begin(),
-                   CaseInsensitiveCompare<char>())) {
-      if (!result.empty())
-        result.append(1, ',');
-      result.append(it.values());
-    }
-  }
 
   // Unfortunately, we do not have access to all of the request headers at this
   // point.  Most notably, we do not have access to an Authorization header if
   // one will be added to the request.
 
-  return result;
+  std::string result;
+  if (request_info.extra_headers.GetHeader(request_header, &result))
+    return result;
+
+  return "";
 }
 
 // static
 void HttpVaryData::AddField(const HttpRequestInfo& request_info,
                             const std::string& request_header,
                             MD5Context* ctx) {
   std::string request_value = GetRequestValue(request_info, request_header);
 
   // Append a character that cannot appear in the request header line so that we
   // protect against case where the concatenation of two request headers could
   // look the same for a variety of values for the individual request headers.
   // For example, "foo: 12\nbar: 3" looks like "foo: 1\nbar: 23" otherwise.
   request_value.append(1, '\n');
 
   MD5Update(ctx, request_value.data(), request_value.size());
 }
 
 }  // namespace net