Cleanup: have common HttpResponseHeaders routine to update with range

net/http/http_util.h

 // 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.
 
 #ifndef NET_HTTP_HTTP_UTIL_H_
 #define NET_HTTP_HTTP_UTIL_H_
 
 #include <string>
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/strings/string_tokenizer.h"
 #include "net/base/net_export.h"
 #include "net/http/http_byte_range.h"
 #include "net/http/http_version.h"
 #include "url/gurl.h"
 
 // This is a macro to support extending this string literal at compile time.
 // Please excuse me polluting your global namespace!
 #define HTTP_LWS " \t"
 
 namespace net {
 
+class HttpResponseHeaders;
+
 class NET_EXPORT HttpUtil {
  public:
   // Returns the absolute path of the URL, to be used for the http request.
   // The absolute path starts with a '/' and may contain a query.
   static std::string PathForRequest(const GURL& url);
 
   // Returns the absolute URL, to be used for the http request. This url is
   // made up of the protocol, host, [port], path, [query]. Everything else
   // is stripped (username, password, reference).
   static std::string SpecForRequest(const GURL& url);
@@ skipping 25 matching lines @@
   // "Range" header is defined in RFC 2616 Section 14.35.1.
   // http://www.w3.org/Protocols/rfc2616/rfc2616-sec14.html#sec14.35.1
   static bool ParseRanges(const std::string& headers,
                           std::vector<HttpByteRange>* ranges);
 
   // Same thing as ParseRanges except the Range header is known and its value
   // is directly passed in, rather than requiring searching through a string.
   static bool ParseRangeHeader(const std::string& range_specifier,
                                std::vector<HttpByteRange>* ranges);
 
+  // Updates Content-Length and Content-Range headers in the |headers|

[rvargas (doing something else), 2014/03/05 19:47:33]

tiny nit: go as close to 80 columns as possible.

[kinuko, 2014/03/06 04:11:29]

Done.

+  // to include the right content length and range for |byte_range|.
+  // This also updates HTTP status line if |replace_status_line| is true.
+  // |byte_range| must be valid, otherwise this returns false and does
+  // not update |headers|.
+  static bool UpdateResponseHeadersWithRange(

[rvargas (doing something else), 2014/03/05 19:47:33]

Did you consider making this a member of ResponseHeaders instead?. This code is
not as general as the usual ResponseHeaders API, but given that it operates
directly on a response header it probably should be there.

[kinuko, 2014/03/06 04:11:29]

Makes sense, I was worried that no other http util directly works on
ResponseHeaders. Done.

+      const HttpByteRange& byte_range,
+      int64 resource_size,
+      bool replace_status_line,
+      HttpResponseHeaders* headers);
+
   // Scans the '\r\n'-delimited headers for the given header name.  Returns
   // true if a match is found.  Input is assumed to be well-formed.
   // TODO(darin): kill this
   static bool HasHeader(const std::string& headers, const char* name);
 
   // Returns true if it is safe to allow users and scripts to specify the header
   // named |name|.
   static bool IsSafeHeader(const std::string& name);
 
   // Strips all header lines from |headers| whose name matches
@@ skipping 271 matching lines @@
     // into the original's unquoted_value_ member.
     std::string unquoted_value_;
 
     bool value_is_quoted_;
   };
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_UTIL_H_