Fix UrlFetcher upload retry handling.

net/url_request/test_url_fetcher_factory.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_TEST_URL_FETCHER_FACTORY_H_
 #define NET_URL_REQUEST_TEST_URL_FETCHER_FACTORY_H_
 
 #include <list>
 #include <map>
 #include <string>
@@ skipping 63 matching lines @@
     // Callback issued correspondingly to the destructor.
     virtual void OnRequestEnd(int fetcher_id) = 0;
   };
 
   TestURLFetcher(int id,
                  const GURL& url,
                  URLFetcherDelegate* d);
   virtual ~TestURLFetcher();
 
   // URLFetcher implementation
-  virtual void SetUploadDataStream(
-      const std::string& upload_content_type,
-      scoped_ptr<UploadDataStream> upload_content) OVERRIDE;
   virtual void SetUploadData(const std::string& upload_content_type,
                              const std::string& upload_content) OVERRIDE;
   virtual void SetChunkedUpload(
       const std::string& upload_content_type) OVERRIDE;
   // Overriden to cache the chunks uploaded. Caller can read back the uploaded
   // chunks with the upload_chunks() accessor.
   virtual void AppendChunkToUpload(const std::string& data,
                                    bool is_last_chunk) OVERRIDE;
   virtual void SetLoadFlags(int load_flags) OVERRIDE;
   virtual int GetLoadFlags() const OVERRIDE;
@@ skipping 44 matching lines @@
       bool take_ownership, base::FilePath* out_response_path) const OVERRIDE;
 
   // Sets owner of this class.  Set it to a non-NULL value if you want
   // to automatically unregister this fetcher from the owning factory
   // upon destruction.
   void set_owner(TestURLFetcherFactory* owner) { owner_ = owner; }
 
   // Unique ID in our factory.
   int id() const { return id_; }
 
-  // Returns the data stream uploaded on this URLFetcher.
-  const UploadDataStream* upload_data_stream() const {
-    return upload_data_stream_.get();
-  }
-
   // Returns the data uploaded on this URLFetcher.
   const std::string& upload_data() const { return upload_data_; }
 
   // Returns the chunks of data uploaded on this URLFetcher.
   const std::list<std::string>& upload_chunks() const { return chunks_; }
 
   // Checks whether the last call to |AppendChunkToUpload(...)| was final.
   bool did_receive_last_chunk() const { return did_receive_last_chunk_; }
 
   // Returns the delegate installed on the URLFetcher.
@@ skipping 21 matching lines @@
     STRING,  // Default: In a std::string
     TEMP_FILE  // Write to a temp file
   };
 
   TestURLFetcherFactory* owner_;
   const int id_;
   const GURL original_url_;
   URLFetcherDelegate* delegate_;
   DelegateForTests* delegate_for_tests_;
   std::string upload_data_;
-  scoped_ptr<UploadDataStream> upload_data_stream_;
   std::list<std::string> chunks_;
   bool did_receive_last_chunk_;
 
   // User can use set_* methods to provide values returned by getters.
   // Setting the real values is not possible, because the real class
   // has no setters. The data is a private member of a class defined
   // in a .cc file, so we can't get at it with friendship.
   int fake_load_flags_;
   GURL fake_url_;
   URLRequestStatus fake_status_;
@@ skipping 131 matching lines @@
       int id,
       const GURL& url,
       URLFetcher::RequestType request_type,
       URLFetcherDelegate* d) OVERRIDE;
 
 };
 
 }  // namespace net
 
 #endif  // NET_URL_REQUEST_TEST_URL_FETCHER_FACTORY_H_