Added DownloadProcessHandle class.

chrome/browser/download/download_item.h

 // 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.
 //
 // Each download is represented by a DownloadItem, and all DownloadItems
 // are owned by the DownloadManager which maintains a global list of all
 // downloads. DownloadItems are created when a user initiates a download,
 // and exist for the duration of the browser life time.
 //
 // Download observers:
 //   DownloadItem::Observer:
 //     - allows observers to receive notifications about one download from start
 //       to completion
 // Use AddObserver() / RemoveObserver() on the appropriate download object to
 // receive state updates.
 
 #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_H_
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_H_
 #pragma once
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/file_path.h"
 #include "base/observer_list.h"
 #include "base/time.h"
 #include "base/timer.h"
+#include "chrome/browser/download/download_process_handle.h"
 #include "googleurl/src/gurl.h"
 
 class DownloadFileManager;
 class DownloadManager;
 struct DownloadCreateInfo;
 
 // One DownloadItem per download. This is the model class that stores all the
 // state for a download. Multiple views, such as a tab's download shelf and the
 // Destination tab's download view, may refer to a given DownloadItem.
 //
@@ skipping 215 matching lines @@
   int64 total_bytes() const { return total_bytes_; }
   void set_total_bytes(int64 total_bytes) { total_bytes_ = total_bytes; }
   int64 received_bytes() const { return received_bytes_; }
   int32 id() const { return id_; }
   base::Time start_time() const { return start_time_; }
   void set_db_handle(int64 handle) { db_handle_ = handle; }
   int64 db_handle() const { return db_handle_; }
   bool is_paused() const { return is_paused_; }
   bool open_when_complete() const { return open_when_complete_; }
   void set_open_when_complete(bool open) { open_when_complete_ = open; }
-  int render_process_id() const { return render_process_id_; }
-  int request_id() const { return request_id_; }
+  int render_process_id() const { return process_handle_.child_id(); }

[Paweł Hajdan Jr., 2011/05/05 20:13:51]

Just wondering, can we remove those accessors completely in favor of
process_handle? Rather up to you, but I prefer when there is just one way to do
a thing.

[ahendrickson, 2011/05/06 16:16:50]

Done.

+  int request_id() const { return process_handle_.request_id(); }
   SafetyState safety_state() const { return safety_state_; }
   void set_safety_state(SafetyState safety_state) {
     safety_state_ = safety_state;
   }
   DangerType danger_type() { return danger_type_;}
   bool auto_opened() { return auto_opened_; }
   FilePath target_name() const { return target_name_; }
   bool save_as() const { return save_as_; }
   bool is_otr() const { return is_otr_; }
   bool is_extension_install() const { return is_extension_install_; }
   bool name_finalized() const { return name_finalized_; }
   bool is_temporary() const { return is_temporary_; }
   void set_opened(bool opened) { opened_ = opened; }
   bool opened() const { return opened_; }
 
+  const DownloadProcessHandle& process_handle() const {
+    return process_handle_;
+  }
+
   // Returns the final target file path for the download.
   FilePath GetTargetFilePath() const;
 
   // Returns the file-name that should be reported to the user, which is
   // target_name_ possibly with the uniquifier number.
   FilePath GetFileNameToReportUser() const;
 
   // Returns the user-verified target file path for the download.
   // This returns the same path as GetTargetFilePath() for safe downloads
   // but does not for dangerous downloads until the name is verified.
@@ skipping 41 matching lines @@
 
   // The value of the content type header received when downloading
   // this item.  |mime_type_| may be different because of type sniffing.
   std::string original_mime_type_;
 
   // Total bytes expected
   int64 total_bytes_;
 
   // Current received bytes
   int64 received_bytes_;
+  DownloadProcessHandle process_handle_;

[Paweł Hajdan Jr., 2011/05/05 20:13:51]

nit: There should be an empty line above an a comment. Also, it's probably
better to add it in place of removed members.

[ahendrickson, 2011/05/06 16:16:50]

Done.

 
   // Last error.
   int last_os_error_;
 
   // Start time for calculating remaining time
   base::TimeTicks start_tick_;
 
   // The current state of this download
   DownloadState state_;
 
@@ skipping 28 matching lines @@
   // Whether the download was auto-opened. We set this rather than using
   // an observer as it's frequently possible for the download to be auto opened
   // before the observer is added.
   bool auto_opened_;
 
   // Dangerous downloads or ongoing downloads are given temporary names until
   // the user approves them or the downloads finish.
   // This stores their final target name.
   FilePath target_name_;
 
-  // For canceling or pausing requests.
-  int render_process_id_;
-  int request_id_;
-
   // True if the item was downloaded as a result of 'save as...'
   bool save_as_;
 
   // True if the download was initiated in an incognito window.
   bool is_otr_;
 
   // True if the item was downloaded for an extension installation.
   bool is_extension_install_;
 
   // True if the filename is finalized.
   bool name_finalized_;
 
   // True if the item was downloaded temporarily.
   bool is_temporary_;
 
   // True if we've saved all the data for the download.
   bool all_data_saved_;
 
   // Did the user open the item either directly or indirectly (such as by
   // setting always open files of this type)? The shelf also sets this field
   // when the user closes the shelf before the item has been opened but should
   // be treated as though the user opened it.
   bool opened_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadItem);
 };
 
 #endif  // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_H_