Fix various issues in RedirectToFileResourceHandler.

content/browser/loader/redirect_to_file_resource_handler.h

Index: content/browser/loader/redirect_to_file_resource_handler.h
diff --git a/content/browser/loader/redirect_to_file_resource_handler.h b/content/browser/loader/redirect_to_file_resource_handler.h
index 3d62835e8888d734a8e144356177d6a1faa87ea2..4b1d8ce173566ba1d20bc268cd5a690da92a16e8 100644
--- a/content/browser/loader/redirect_to_file_resource_handler.h
+++ b/content/browser/loader/redirect_to_file_resource_handler.h
@@ -5,6 +5,7 @@
 #ifndef CONTENT_BROWSER_LOADER_REDIRECT_TO_FILE_RESOURCE_HANDLER_H_
 #define CONTENT_BROWSER_LOADER_REDIRECT_TO_FILE_RESOURCE_HANDLER_H_
 
+#include "base/callback_forward.h"
 #include "base/files/file_path.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
@@ -24,19 +25,35 @@ class ShareableFileReference;
 }
 
 namespace content {
-class ResourceDispatcherHostImpl;
+
+// A factory for creating the temporary stream. This removes the dependency on
+// ResourceDispatcherHost and gives a hook for mocking in errors in unit tests.
+class TemporaryFileStreamFactory {
+ public:
+  typedef base::Callback<
+      void(base::PlatformFileError,
+           scoped_ptr<net::FileStream>,
+           scoped_refptr<webkit_blob::ShareableFileReference>)> Callback;
+
+  virtual ~TemporaryFileStreamFactory() {}
+
+  virtual void CreateTemporary(int child_id,
+                               int request_id,
+                               const Callback& callback) = 0;
+};
 
 // Redirects network data to a file.  This is intended to be layered in front
 // of either the AsyncResourceHandler or the SyncResourceHandler.
-class RedirectToFileResourceHandler : public LayeredResourceHandler {
+class CONTENT_EXPORT RedirectToFileResourceHandler
+    : public LayeredResourceHandler {
  public:
   RedirectToFileResourceHandler(
       scoped_ptr<ResourceHandler> next_handler,
       net::URLRequest* request,
-      ResourceDispatcherHostImpl* resource_dispatcher_host);
+      TemporaryFileStreamFactory* file_stream_factory);
   virtual ~RedirectToFileResourceHandler();
 
-  // ResourceHandler implementation:
+  // LayeredResourceHandler implementation:
   virtual bool OnResponseStarted(int request_id,
                                  ResourceResponse* response,
                                  bool* defer) OVERRIDE;
@@ -56,17 +73,16 @@ class RedirectToFileResourceHandler : public LayeredResourceHandler {
                                    bool* defer) OVERRIDE;
 
  private:
-  void DidCreateTemporaryFile(base::PlatformFileError error_code,
-                              base::PassPlatformFile file_handle,
-                              const base::FilePath& file_path);
+  void DidCreateTemporaryFile(
+      base::PlatformFileError error_code,
+      scoped_ptr<net::FileStream> file_stream,
+      scoped_refptr<webkit_blob::ShareableFileReference> deletable_file);
   void DidWriteToFile(int result);
   bool WriteMore();
   bool BufIsFull() const;
   void ResumeIfDeferred();
 
-  base::WeakPtrFactory<RedirectToFileResourceHandler> weak_factory_;
-
-  ResourceDispatcherHostImpl* host_;
+  TemporaryFileStreamFactory* file_stream_factory_;
 
   // We allocate a single, fixed-size IO buffer (buf_) used to read from the
   // network (buf_write_pending_ is true while the system is copying data into
@@ -93,12 +109,15 @@ class RedirectToFileResourceHandler : public LayeredResourceHandler {
   // file created as  a result of the download.
   scoped_refptr<webkit_blob::ShareableFileReference> deletable_file_;
 
-  bool did_defer_ ;
+  bool did_defer_;
 
   bool completed_during_write_;
+  GURL will_start_url_;
   net::URLRequestStatus completed_status_;
   std::string completed_security_info_;
 
+  base::WeakPtrFactory<RedirectToFileResourceHandler> weak_factory_;
+
   DISALLOW_COPY_AND_ASSIGN(RedirectToFileResourceHandler);
 };