Http cache: Always preserve extra headers when dealing with...

net/http/partial_data.cc

Index: net/http/partial_data.cc
===================================================================
--- net/http/partial_data.cc	(revision 30754)
+++ net/http/partial_data.cc	(working copy)
@@ -22,8 +22,7 @@
 
 namespace net {
 
-bool PartialData::Init(const std::string& headers,
-                       const std::string& new_headers) {
+bool PartialData::Init(const std::string& headers) {
   std::vector<HttpByteRange> ranges;
   if (!HttpUtil::ParseRanges(headers, &ranges) || ranges.size() != 1)
     return false;
@@ -33,13 +32,16 @@
   if (!byte_range_.IsValid())
     return false;
 
-  extra_headers_ = new_headers;
   resource_size_ = 0;
-
   current_range_start_ = byte_range_.first_byte_position();
   return true;
 }
 
+void PartialData::SetHeaders(const std::string& headers) {
+  DCHECK(extra_headers_.empty());
+  extra_headers_ = headers;
+}
+
 void PartialData::RestoreHeaders(std::string* headers) const {
   DCHECK(current_range_start_ >= 0 || byte_range_.IsSuffixByteRange());
   int64 end = byte_range_.IsSuffixByteRange() ?