Added a download file factory to the download file manager, for testing.

content/browser/download/download_file_manager.cc

 // Copyright (c) 2011 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.
 
 #include "content/browser/download/download_file_manager.h"
 
 #include <set>
 #include <string>
 
 #include "base/bind.h"
@@ skipping 18 matching lines @@
 using content::BrowserThread;
 
 namespace {
 
 // Throttle updates to the UI thread so that a fast moving download doesn't
 // cause it to become unresponsive (in milliseconds).
 const int kUpdatePeriodMs = 500;
 
 }  // namespace
 
-DownloadFileManager::DownloadFileManager(ResourceDispatcherHost* rdh)
-    : resource_dispatcher_host_(rdh) {
+DownloadFileManager::DownloadFileManager(ResourceDispatcherHost* rdh,
+                                         DownloadFileFactory* factory)
+    : resource_dispatcher_host_(rdh), download_file_factory_(factory) {

[cbentzel, 2011/12/07 18:58:21]

Should DCHECK here that both rdh and factory are non-null.

[ahendrickson, 2011/12/07 19:55:15]

rdh is allowed to be NULL.

If |factory| is NULL, we will use the default factory, which is now defined in
this file.

 }
 
 DownloadFileManager::~DownloadFileManager() {
   DCHECK(downloads_.empty());
 }
 
 void DownloadFileManager::Shutdown() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
@@ skipping 10 matching lines @@
     DownloadCreateInfo* info, const DownloadRequestHandle& request_handle,
     DownloadManager* download_manager, bool get_hash) {
   DCHECK(info);
   VLOG(20) << __FUNCTION__ << "()" << " info = " << info->DebugString();
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
 
   // Life of |info| ends here. No more references to it after this method.
   scoped_ptr<DownloadCreateInfo> infop(info);
 
   scoped_ptr<DownloadFile> download_file(
-      new DownloadFileImpl(info,
-                           new DownloadRequestHandle(request_handle),
-                           download_manager));
+      download_file_factory_->GetFile(info, request_handle, download_manager));

[cbentzel, 2011/12/07 18:58:21]

that one unit test passes in a NULL DownloadFileFactory, you probably want a
fake one.

[ahendrickson, 2011/12/07 19:55:15]

Done.

   if (net::OK != download_file->Initialize(get_hash)) {
     request_handle.CancelRequest();
     return;
   }
 
   DCHECK(GetDownloadFile(info->download_id) == NULL);
   downloads_[info->download_id] = download_file.release();
 
   // The file is now ready, we can un-pause the request and start saving data.
   request_handle.ResumeRequest();
@@ skipping 342 matching lines @@
            << " id = " << global_id
            << " download_file = " << download_file->DebugString();
 
   downloads_.erase(global_id);
 
   delete download_file;
 
   if (downloads_.empty())
     StopUpdateTimer();
 }