Fix UrlFetcher upload retry handling.

net/url_request/url_fetcher_core.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_URL_REQUEST_URL_FETCHER_CORE_H_
 #define NET_URL_REQUEST_URL_FETCHER_CORE_H_
 
 #include <set>
 #include <string>
 
@@ skipping 44 matching lines @@
 
   // Stops any in-progress load and ensures no callback will happen.  It is
   // safe to call this multiple times.
   void Stop();
 
   // URLFetcher-like functions.
 
   // For POST requests, set |content_type| to the MIME type of the
   // content and set |content| to the data to upload.
   void SetUploadDataStream(const std::string& upload_content_type,
-                           scoped_ptr<UploadDataStream> upload_content);
+                           scoped_ptr<UploadDataStream> upload_data_stream);
   void SetUploadData(const std::string& upload_content_type,
                      const std::string& upload_content);
   void SetChunkedUpload(const std::string& upload_content_type);
   // Adds a block of data to be uploaded in a POST body. This can only be
   // called after Start().
   void AppendChunkToUpload(const std::string& data, bool is_last_chunk);
   // |flags| are flags to apply to the load operation--these should be
   // one or more of the LOAD_* flags defined in net/base/load_flags.h.
   void SetLoadFlags(int load_flags);
   int GetLoadFlags() const;
@@ skipping 252 matching lines @@
   GURL first_party_for_cookies_;     // The first party URL for the request
   // The user data to add to each newly-created URLRequest.
   const void* url_request_data_key_;
   URLFetcher::CreateDataCallback url_request_create_data_callback_;
   ResponseCookies cookies_;          // Response cookies
   HttpRequestHeaders extra_request_headers_;
   scoped_refptr<HttpResponseHeaders> response_headers_;
   bool was_fetched_via_proxy_;
   HostPortPair socket_address_;
 
-  scoped_ptr<UploadDataStream> upload_content_;  // HTTP POST payload
+  scoped_ptr<UploadDataStream> upload_data_stream_;  // POST payload stream.
+  std::string upload_content_;                       // POST payload contents.
+
   std::string upload_content_type_;  // MIME type of POST payload
   std::string referrer_;             // HTTP Referer header value
   bool is_chunked_upload_;           // True if using chunked transfer encoding
 
   // Used to determine how long to wait before making a request or doing a
   // retry.
   //
   // Both of them can only be accessed on the IO thread.
   //
   // We need not only the throttler entry for |original_URL|, but also
@@ skipping 68 matching lines @@
   base::debug::StackTrace stack_trace_;
 
   static base::LazyInstance<Registry> g_registry;
 
   DISALLOW_COPY_AND_ASSIGN(URLFetcherCore);
 };
 
 }  // namespace net
 
 #endif  // NET_URL_REQUEST_URL_FETCHER_CORE_H_