Revert 58196 - GTTF: Clean up DownloadFileManager

This removes a lot of duplication, locking, and thread jumping.

Most of the operations run on the FILE thread, and we do not duplicate
so much information. Each DownloadFile keeps track of its DownloadManager
(each Profile has its own DownloadManager). This allows us to remove
many maps from DownloadFileManager that were duplicating that information.

There is still SaveFileManager, but hopefully I will be able
to merge those two in small steps.

TEST=unit_tests, browser_tests, ui_tests
BUG=48913

Review URL: http://codereview.chromium.org/3245005

TBR=phajdan.jr@chromium.org
Review URL: http://codereview.chromium.org/3348010

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@58718 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 2 insertions, 16 deletions

diff --git a/chrome/browser/download/download_file.cc b/chrome/browser/download/download_file.cc
index ab56380..c877a6e 100644
--- a/chrome/browser/download/download_file.cc
+++ b/chrome/browser/download/download_file.cc
@@ -10,19 +10,15 @@
 #include "chrome/browser/download/download_util.h"
 #include "chrome/browser/history/download_types.h"
 
-DownloadFile::DownloadFile(const DownloadCreateInfo* info,
-                           DownloadManager* download_manager)
+DownloadFile::DownloadFile(const DownloadCreateInfo* info)
     : BaseFile(info->save_info.file_path,
                info->url,
                info->referrer_url,
-               info->received_bytes,
                info->save_info.file_stream),
       id_(info->download_id),
       child_id_(info->child_id),
-      request_id_(info->request_id),
-      download_manager_(download_manager) {
+      request_id_(info->request_id) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
-
 }
 
 DownloadFile::~DownloadFile() {
@@ -44,13 +40,3 @@ void DownloadFile::CancelDownloadRequest(ResourceDispatcherHost* rdh) {
                           child_id_,
                           request_id_));
 }
-
-void DownloadFile::OnDownloadManagerShutdown() {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
-  download_manager_ = NULL;
-}
-
-DownloadManager* DownloadFile::GetDownloadManager() {
-  DCHECK(ChromeThread::CurrentlyOn(ChromeThread::FILE));
-  return download_manager_.get();
-}