Fix various issues in RedirectToFileResourceHandler.

content/browser/loader/resource_dispatcher_host_impl.h

Index: content/browser/loader/resource_dispatcher_host_impl.h
diff --git a/content/browser/loader/resource_dispatcher_host_impl.h b/content/browser/loader/resource_dispatcher_host_impl.h
index ef0e4cfdb75b2ebb271cd242243baa67a511bfd2..1a12bd813acdc2113172cfdaadc6a344e349de02 100644
--- a/content/browser/loader/resource_dispatcher_host_impl.h
+++ b/content/browser/loader/resource_dispatcher_host_impl.h
@@ -49,10 +49,6 @@ namespace net {
 class URLRequestJobFactory;
 }
 
-namespace webkit_blob {
-class ShareableFileReference;
-}
-
 namespace content {
 class ResourceContext;
 class ResourceDispatcherHostDelegate;
@@ -60,6 +56,7 @@ class ResourceMessageDelegate;
 class ResourceMessageFilter;
 class ResourceRequestInfoImpl;
 class SaveFileManager;
+class TemporaryFileManager;
 class WebContentsImpl;
 struct DownloadSaveInfo;
 struct Referrer;
@@ -180,15 +177,6 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
   // Cancels any blocked request for the specified route id.
   void CancelBlockedRequestsForRoute(int child_id, int route_id);
 
-  // Maintains a collection of temp files created in support of
-  // the download_to_file capability. Used to grant access to the
-  // child process and to defer deletion of the file until it's
-  // no longer needed.
-  void RegisterDownloadedTempFile(
-      int child_id, int request_id,
-      webkit_blob::ShareableFileReference* reference);
-  void UnregisterDownloadedTempFile(int child_id, int request_id);
-
   // Needed for the sync IPC message dispatcher macros.
   bool Send(IPC::Message* message);
 
@@ -420,15 +408,6 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
 
   LoaderMap pending_loaders_;
 
-  // Collection of temp files downloaded for child processes via
-  // the download_to_file mechanism. We avoid deleting them until
-  // the client no longer needs them.
-  typedef std::map<int, scoped_refptr<webkit_blob::ShareableFileReference> >
-      DeletableFilesMap;  // key is request id
-  typedef std::map<int, DeletableFilesMap>
-      RegisteredTempFiles;  // key is child process id
-  RegisteredTempFiles registered_temp_files_;
-
   // A timer that periodically calls UpdateLoadStates while pending_requests_
   // is not empty.
   scoped_ptr<base::RepeatingTimer<ResourceDispatcherHostImpl> >
@@ -506,6 +485,8 @@ class CONTENT_EXPORT ResourceDispatcherHostImpl
 
   scoped_ptr<ResourceScheduler> scheduler_;
 
+  scoped_ptr<TemporaryFileManager> temporary_file_manager_;
+
   typedef std::map<GlobalRoutingID, OfflinePolicy*> OfflineMap;
 
   OfflineMap offline_policy_map_;