Revert 146162 - Move Rename functionality from DownloadFileManager to DownloadFileImple.

content/browser/download/download_file_manager.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.
 //
 // The DownloadFileManager owns a set of DownloadFile objects, each of which
 // represent one in progress download and performs the disk IO for that
 // download. The DownloadFileManager itself is a singleton object owned by the
 // ResourceDispatcherHostImpl.
 //
 // The DownloadFileManager uses the file_thread for performing file write
@@ skipping 31 matching lines @@
 #include <map>
 
 #include "base/atomic_sequence_num.h"
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/gtest_prod_util.h"
 #include "base/hash_tables.h"
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/timer.h"
-#include "content/browser/download/download_file.h"
 #include "content/common/content_export.h"
 #include "content/public/browser/download_id.h"
 #include "content/public/browser/download_interrupt_reasons.h"
 #include "net/base/net_errors.h"
 #include "ui/gfx/native_widget_types.h"
 
 struct DownloadCreateInfo;
 class DownloadRequestHandle;
 class FilePath;
 
 namespace content {
 class ByteStreamReader;
+class DownloadFile;
 class DownloadId;
 class DownloadManager;
 }
 
 namespace net {
 class BoundNetLog;
 }
 
 // Manages all in progress downloads.
 // Methods are virtual to allow mocks--this class is not intended
 // to be a base class.
 class CONTENT_EXPORT DownloadFileManager
     : public base::RefCountedThreadSafe<DownloadFileManager> {
  public:
   // Callback used with CreateDownloadFile().  |reason| will be
   // DOWNLOAD_INTERRUPT_REASON_NONE on a successful creation.
   typedef base::Callback<void(content::DownloadInterruptReason reason)>
       CreateDownloadFileCallback;
 
   // Callback used with RenameDownloadFile().
-  typedef content::DownloadFile::RenameCompletionCallback
-      RenameCompletionCallback;
+  typedef base::Callback<void(const FilePath&)> RenameCompletionCallback;
 
   class DownloadFileFactory {
    public:
     virtual ~DownloadFileFactory() {}
 
     virtual content::DownloadFile* CreateFile(
         DownloadCreateInfo* info,
         scoped_ptr<content::ByteStreamReader> stream,
         content::DownloadManager* download_manager,
         bool calculate_hash,
@@ skipping 74 matching lines @@
 
   // A map of all in progress downloads.  It owns the download files.
   DownloadFileMap downloads_;
 
   scoped_ptr<DownloadFileFactory> download_file_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadFileManager);
 };
 
 #endif  // CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_FILE_MANAGER_H_