Change DownloadProcessHandle to be more of an encapsulated class.

chrome/browser/download/download_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 "chrome/browser/download/download_manager.h"
 
 #include "base/callback.h"
 #include "base/file_util.h"
 #include "base/i18n/case_conversion.h"
 #include "base/logging.h"
@@ skipping 731 matching lines @@
 
   // Clean up will happen when the history system create callback runs if we
   // don't have a valid db_handle yet.
   if (download->db_handle() != DownloadHistory::kUninitializedHandle) {
     in_progress_.erase(it);
     active_downloads_.erase(download_id);
     UpdateAppIcon();  // Reflect removal from in_progress_.
     download_history_->UpdateEntry(download);
   }
 
   DownloadCancelledInternal(download_id, download->process_handle());

[Paweł Hajdan Jr., 2011/06/04 08:58:51]

It seems this is the only place that calls DownloadCancelledInternal. Could you
remove the Internal method and just paste its contents (without the DCHECK)
here?

[Randy Smith (Not in Mondays), 2011/06/07 22:41:11]

It's also called from FileSelectionCancelled, at least in my sandbox.

 }
 
 void DownloadManager::DownloadCancelledInternal(
     int download_id, DownloadProcessHandle process_handle) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-  // Cancel the network request.  RDH is guaranteed to outlive the IO thread.

[hendrickson_a, 2011/06/04 16:01:45]

I'd like this comment to be preserved (in download_process_handle.cc?).

[Randy Smith (Not in Mondays), 2011/06/07 22:41:11]

Done.

-  download_util::CancelDownloadRequest(
-      g_browser_process->resource_dispatcher_host(), process_handle);
+  process_handle.CancelRequest();
 
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(
           file_manager_, &DownloadFileManager::CancelDownload, download_id));
 }
 
 void DownloadManager::OnDownloadError(int32 download_id,
                                       int64 size,
                                       int os_error) {
@@ skipping 23 matching lines @@
     UpdateAppIcon();  // Reflect removal from in_progress_.
     download_history_->UpdateEntry(download);
   }
 
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(
           file_manager_, &DownloadFileManager::CancelDownload, download_id));
 }
 
-void DownloadManager::PauseDownload(int32 download_id, bool pause) {
-  DownloadMap::iterator it = in_progress_.find(download_id);
-  if (it == in_progress_.end())
-    return;
-
-  DownloadItem* download = it->second;
-  if (pause == download->is_paused())
-    return;
-
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      NewRunnableMethod(this,
-                        &DownloadManager::PauseDownloadRequest,
-                        g_browser_process->resource_dispatcher_host(),
-                        download->process_handle(),
-                        pause));
-}
-
 void DownloadManager::UpdateAppIcon() {
   if (status_updater_)
     status_updater_->Update();
 }
 
-void DownloadManager::PauseDownloadRequest(ResourceDispatcherHost* rdh,
-                                           DownloadProcessHandle process_handle,
-                                           bool pause) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::IO));
-  rdh->PauseRequest(process_handle.child_id(),
-                    process_handle.request_id(),
-                    pause);
-}
-
 void DownloadManager::RemoveDownload(int64 download_handle) {
   DownloadMap::iterator it = history_downloads_.find(download_handle);
   if (it == history_downloads_.end())
     return;
 
   // Make history update.
   DownloadItem* download = it->second;
   download_history_->RemoveEntry(download);
 
   // Remove from our tables and delete.
@@ skipping 431 matching lines @@
     observed_download_manager_->RemoveObserver(this);
 }
 
 void DownloadManager::OtherDownloadManagerObserver::ModelChanged() {
   observing_download_manager_->NotifyModelChanged();
 }
 
 void DownloadManager::OtherDownloadManagerObserver::ManagerGoingDown() {
   observed_download_manager_ = NULL;
 }