Revert 61899 for breaking cookes on file:// URLs....

chrome/browser/download/download_manager.cc

 // Copyright (c) 2010 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 "chrome/browser/download/download_manager.h"
 
 #include "app/l10n_util.h"
 #include "app/resource_bundle.h"
 #include "base/callback.h"
 #include "base/file_util.h"
@@ skipping 58 matching lines @@
   if (!shutdown_needed_)
     return;
   shutdown_needed_ = false;
 
   FOR_EACH_OBSERVER(Observer, observers_, ManagerGoingDown());
 
   if (file_manager_) {
     ChromeThread::PostTask(ChromeThread::FILE, FROM_HERE,
         NewRunnableMethod(file_manager_,
                           &DownloadFileManager::OnDownloadManagerShutdown,
-                          make_scoped_refptr(this)));
+                          this));
   }
 
   // 'in_progress_' may contain DownloadItems that have not finished the start
   // complete (from the history service) and thus aren't in downloads_.
   DownloadMap::iterator it = in_progress_.begin();
   std::set<DownloadItem*> to_remove;
   for (; it != in_progress_.end(); ++it) {
     DownloadItem* download = it->second;
     if (download->safety_state() == DownloadItem::DANGEROUS) {
       // Forget about any download that the user did not approve.
@@ skipping 340 matching lines @@
   bool download_finished = ContainsKey(pending_finished_downloads_,
                                        info->download_id);
 
   if (download_finished || info->is_dangerous) {
     // The download has already finished or the download is not safe.
     // We can now rename the file to its final name (or its tentative name
     // in dangerous download cases).
     ChromeThread::PostTask(
         ChromeThread::FILE, FROM_HERE,
         NewRunnableMethod(
-            file_manager_,
-            &DownloadFileManager::OnFinalDownloadName,
-            download->id(),
-            target_path,
-            !info->is_dangerous,
-            make_scoped_refptr(this)));
+            file_manager_, &DownloadFileManager::OnFinalDownloadName,
+            download->id(), target_path, !info->is_dangerous, this));
   } else {
     // The download hasn't finished and it is a safe download.  We need to
     // rename it to its intermediate '.crdownload' path.
     FilePath download_path = download_util::GetCrDownloadPath(target_path);
     ChromeThread::PostTask(
         ChromeThread::FILE, FROM_HERE,
         NewRunnableMethod(
-            file_manager_,
-            &DownloadFileManager::OnIntermediateDownloadName,
-            download->id(),
-            download_path,
-            make_scoped_refptr(this)));
+            file_manager_, &DownloadFileManager::OnIntermediateDownloadName,
+            download->id(), download_path, this));
     download->set_need_final_rename(true);
   }
 
   if (download_finished) {
     // If the download already completed by the time we reached this point, then
     // notify observers that it did.
     OnAllDataSaved(info->download_id,
                    pending_finished_downloads_[info->download_id]);
   }
 
@@ skipping 64 matching lines @@
             this, &DownloadManager::ProceedWithFinishedDangerousDownload,
             download->db_handle(),
             download->full_path(), download->original_name()));
     return;
   }
 
   if (download->need_final_rename()) {
     ChromeThread::PostTask(
         ChromeThread::FILE, FROM_HERE,
         NewRunnableMethod(
-            file_manager_,
-            &DownloadFileManager::OnFinalDownloadName,
-            download->id(),
-            download->full_path(),
-            false,
-            make_scoped_refptr(this)));
+            file_manager_, &DownloadFileManager::OnFinalDownloadName,
+            download->id(), download->full_path(), false, this));
     return;
   }
 
   ContinueDownloadFinished(download);
 }
 
 void DownloadManager::DownloadRenamedToFinalName(int download_id,
                                                  const FilePath& full_path) {
   DCHECK(ChromeThread::CurrentlyOn(ChromeThread::UI));
 
@@ skipping 467 matching lines @@
     observed_download_manager_->RemoveObserver(this);
 }
 
 void DownloadManager::OtherDownloadManagerObserver::ModelChanged() {
   observing_download_manager_->NotifyModelChanged();
 }
 
 void DownloadManager::OtherDownloadManagerObserver::ManagerGoingDown() {
   observed_download_manager_ = NULL;
 }