Cleanup: have common HttpResponseHeaders routine to update with range

webkit/browser/appcache/appcache_url_request_job.cc

 // 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.
 
 #include "webkit/browser/appcache/appcache_url_request_job.h"
 
 #include <vector>
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
@@ skipping 292 matching lines @@
 
 void AppCacheURLRequestJob::SetupRangeResponse() {
   DCHECK(is_range_request() && info_.get() && reader_.get() &&
          is_delivering_appcache_response());
   int resource_size = static_cast<int>(info_->response_data_size());
   if (resource_size < 0 || !range_requested_.ComputeBounds(resource_size)) {
     range_requested_ = net::HttpByteRange();
     return;
   }
 
-  DCHECK(range_requested_.HasFirstBytePosition() &&
-         range_requested_.HasLastBytePosition());
+  DCHECK(range_requested_.IsValid());
   int offset = static_cast<int>(range_requested_.first_byte_position());
   int length = static_cast<int>(range_requested_.last_byte_position() -
                                 range_requested_.first_byte_position() + 1);
 
   // Tell the reader about the range to read.
   reader_->SetReadRange(offset, length);
 
   // Make a copy of the full response headers and fix them up
   // for the range we'll be returning.
-  const char kLengthHeader[] = "Content-Length";
-  const char kRangeHeader[] = "Content-Range";
-  const char kPartialStatusLine[] = "HTTP/1.1 206 Partial Content";
   range_response_info_.reset(
       new net::HttpResponseInfo(*info_->http_response_info()));
   net::HttpResponseHeaders* headers = range_response_info_->headers.get();
-  headers->RemoveHeader(kLengthHeader);
-  headers->RemoveHeader(kRangeHeader);
-  headers->ReplaceStatusLine(kPartialStatusLine);
-  headers->AddHeader(
-      base::StringPrintf("%s: %d", kLengthHeader, length));
-  headers->AddHeader(
-      base::StringPrintf("%s: bytes %d-%d/%d",
-                         kRangeHeader,
-                         offset,
-                         offset + length - 1,
-                         resource_size));
+  net::HttpUtil::UpdateResponseHeadersWithRange(
+      range_requested_, resource_size, true /* replace status line */, headers);
 }
 
 void AppCacheURLRequestJob::OnReadComplete(int result) {
   DCHECK(is_delivering_appcache_response());
   if (result == 0) {
     NotifyDone(net::URLRequestStatus());
   } else if (result < 0) {
     if (storage_->service()->storage() == storage_) {
       storage_->service()->CheckAppCacheResponse(manifest_url_, cache_id_,
                                                  entry_.response_id());
@@ skipping 93 matching lines @@
     return;
   }
 
   // If multiple ranges are requested, we play dumb and
   // return the entire response with 200 OK.
   if (ranges.size() == 1U)
     range_requested_ = ranges[0];
 }
 
 }  // namespace appcache