Merge 33253 - Revert 33133 Http cache: Add code to restart a network request...

net/http/http_cache_transaction.h

 // Copyright (c) 2006-2009 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.
 
 // This file declares HttpCache::Transaction, a private class of HttpCache so
 // it should only be included by http_cache.cc
 
 #ifndef NET_HTTP_HTTP_CACHE_TRANSACTION_H_
 #define NET_HTTP_HTTP_CACHE_TRANSACTION_H_
 
@@ skipping 138 matching lines @@
   int RestartNetworkRequestWithAuth(const std::wstring& username,
                                     const std::wstring& password);
 
   // Called to determine if we need to validate the cache entry before using it.
   bool RequiresValidation();
 
   // Called to make the request conditional (to ask the server if the cached
   // copy is valid).  Returns true if able to make the request conditional.
   bool ConditionalizeRequest();
 
-  // Makes sure that a 206 response is expected.  Returns true on success.
-  // On success, |partial_content| will be set to true if we are processing a
-  // partial entry.
-  bool ValidatePartialResponse(const HttpResponseHeaders* headers,
-                               bool* partial_content);
+  // Makes sure that a 206 response is expected.  Returns a network error code.
+  bool ValidatePartialResponse(const HttpResponseHeaders* headers);
 
   // Handles a response validation error by bypassing the cache.
   void IgnoreRangeRequest();
 
   // Reads data from the network.
   int ReadFromNetwork(IOBuffer* data, int data_len);
 
   // Reads data from the cache entry.
   int ReadFromEntry(IOBuffer* data, int data_len);
 
@@ skipping 87 matching lines @@
       cache_read_callback_;
   scoped_refptr<CancelableCompletionCallback<Transaction> >
       cache_write_callback_;
   scoped_refptr<CancelableCompletionCallback<Transaction> >
       entry_ready_callback_;
 };
 
 }  // namespace net
 
 #endif  // NET_HTTP_HTTP_CACHE_TRANSACTION_H_