Fix UrlFetcher upload retry handling.

net/url_request/url_fetcher.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_H_
 #define NET_URL_REQUEST_URL_FETCHER_H_
 
 #include <string>
 #include <vector>
 
 #include "base/callback_forward.h"
 #include "base/memory/ref_counted.h"
-#include "base/memory/scoped_ptr.h"
 #include "base/platform_file.h"
 #include "base/supports_user_data.h"
 #include "base/task_runner.h"
 #include "net/base/net_export.h"
 
 class GURL;
 
 namespace base {
 class FilePath;
 class MessageLoopProxy;
 class TimeDelta;
 }
 
 namespace net {
 class HostPortPair;
 class HttpRequestHeaders;
 class HttpResponseHeaders;
-class UploadDataStream;
 class URLFetcherDelegate;
 class URLRequestContextGetter;
 class URLRequestStatus;
 typedef std::vector<std::string> ResponseCookies;
 
 // To use this class, create an instance with the desired URL and a pointer to
 // the object to be notified when the URL has been loaded:
 //   URLFetcher* fetcher = URLFetcher::Create("http://www.google.com",
 //                                            URLFetcher::GET, this);
 //
@@ skipping 77 matching lines @@
   static void SetEnableInterceptionForTests(bool enabled);
 
   // Normally, URLFetcher will abort loads that request SSL client certificate
   // authentication, but this method may be used to cause URLFetchers to ignore
   // requests for client certificates and continue anonymously. Because such
   // behaviour affects the URLRequestContext's shared network state and socket
   // pools, it should only be used for testing.
   static void SetIgnoreCertificateRequests(bool ignored);
 
   // Sets data only needed by POSTs.  All callers making POST requests should
-  // call one of the SetUploadData* methods before the request is started.
-  // |upload_content_type| is the MIME type of the content, while
-  // |upload_content| is the data to be sent.
-  virtual void SetUploadDataStream(
-      const std::string& upload_content_type,
-      scoped_ptr<UploadDataStream> upload_content) = 0;
-
-  // Convenience method for setting upload data from a string.
-  // (the Content-Length header value will be set to the length of this data).
+  // call this before the request is started.  |upload_content_type| is the MIME
+  // type of the content, while |upload_content| is the data to be sent (the
+  // Content-Length header value will be set to the length of this data).
   virtual void SetUploadData(const std::string& upload_content_type,
                              const std::string& upload_content) = 0;
 
   // Indicates that the POST data is sent via chunked transfer encoding.
   // This may only be called before calling Start().
   // Use AppendChunkToUpload() to give the data chunks after calling Start().
   virtual void SetChunkedUpload(const std::string& upload_content_type) = 0;
 
   // Adds the given bytes to a request's POST data transmitted using chunked
   // transfer encoding.
@@ skipping 137 matching lines @@
   // be removed once the URLFetcher is destroyed.  User should not take
   // ownership more than once, or call this method after taking ownership.
   virtual bool GetResponseAsFilePath(
       bool take_ownership,
       base::FilePath* out_response_path) const = 0;
 };
 
 }  // namespace net
 
 #endif  // NET_URL_REQUEST_URL_FETCHER_H_