Added DownloadProcessHandle class.

chrome/browser/download/download_item.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_item.h"
 
 #include "base/basictypes.h"
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/i18n/case_conversion.h"
@@ skipping 117 matching lines @@
       state_(static_cast<DownloadState>(info.state)),
       start_time_(info.start_time),
       db_handle_(info.db_handle),
       download_manager_(download_manager),
       is_paused_(false),
       open_when_complete_(false),
       safety_state_(SAFE),
       danger_type_(NOT_DANGEROUS),
       auto_opened_(false),
       target_name_(info.original_name),
-      render_process_id_(-1),
-      request_id_(-1),
       save_as_(false),
       is_otr_(false),
       is_extension_install_(info.is_extension_install),
       is_temporary_(false),
       all_data_saved_(false),
       opened_(false) {
   if (IsInProgress())
     state_ = CANCELLED;
   if (IsComplete())
     all_data_saved_ = true;
@@ skipping 20 matching lines @@
       db_handle_(DownloadHistory::kUninitializedHandle),
       download_manager_(download_manager),
       is_paused_(false),
       open_when_complete_(false),
       safety_state_(GetSafetyState(info.is_dangerous_file,
                                    info.is_dangerous_url)),
       danger_type_(GetDangerType(info.is_dangerous_file,
                                  info.is_dangerous_url)),
       auto_opened_(false),
       target_name_(info.original_name),
-      render_process_id_(info.child_id),
-      request_id_(info.request_id),
+      process_handle_(info.process_handle),
       save_as_(info.prompt_user_for_save_location),
       is_otr_(is_otr),
       is_extension_install_(info.is_extension_install),
       is_temporary_(!info.save_info.file_path.empty()),
       all_data_saved_(false),
       opened_(false) {
   Init(true /* start progress timer */);
 }
 
 // Constructing for the "Save Page As..." feature:
@@ skipping 14 matching lines @@
       start_tick_(base::TimeTicks::Now()),
       state_(IN_PROGRESS),
       start_time_(base::Time::Now()),
       db_handle_(DownloadHistory::kUninitializedHandle),
       download_manager_(download_manager),
       is_paused_(false),
       open_when_complete_(false),
       safety_state_(SAFE),
       danger_type_(NOT_DANGEROUS),
       auto_opened_(false),
-      render_process_id_(-1),
-      request_id_(-1),
       save_as_(false),
       is_otr_(is_otr),
       is_extension_install_(false),
       is_temporary_(false),
       all_data_saved_(false),
       opened_(false) {
   Init(true /* start progress timer */);
 }
 
 DownloadItem::~DownloadItem() {
@@ skipping 381 matching lines @@
 }
 
 bool DownloadItem::IsComplete() const {
   return (state_ == COMPLETE);
 }
 
 std::string DownloadItem::DebugString(bool verbose) const {
   std::string description = base::StringPrintf(
       "{ id_ = %d state = %s", id_, DebugDownloadStateString(state()));
 
+  // Construct a string of the URL chain.
+  std::string url_list("<none>");
+  if (!url_chain_.empty()) {
+    std::vector<GURL>::const_iterator iter = url_chain_.begin();
+    std::vector<GURL>::const_iterator last = url_chain_.end();
+    url_list = (*iter).spec();
+    ++iter;
+    for ( ; verbose && (iter != last); ++iter) {
+      url_list += " -> ";
+      const GURL& next_url = *iter;
+      url_list += next_url.spec();
+    }
+  }
+
   if (verbose) {
     description += base::StringPrintf(
         " db_handle = %" PRId64
         " total_bytes = %" PRId64
-        " is_paused = %c"
-        " is_extension_install = %c"
-        " is_otr = %c"
-        " safety_state = %s"
-        " url = \"%s\""
+        " is_paused = " "%c"
+        " is_extension_install = " "%c"
+        " is_otr = " "%c"
+        " safety_state = " "%s"
+        " url_chain = " "\"%s\""
         " target_name_ = \"%" PRFilePath "\""
-        " full_path = \"%" PRFilePath "\" }",
+        " full_path = \"%" PRFilePath "\"",
         db_handle(),
         total_bytes(),
         is_paused() ? 'T' : 'F',
         is_extension_install() ? 'T' : 'F',
         is_otr() ? 'T' : 'F',
         DebugSafetyStateString(safety_state()),
-        url().spec().c_str(),
+        url_list.c_str(),
         target_name_.value().c_str(),
         full_path().value().c_str());
   } else {
-    description += " url = \"" + url().spec() + "\" }";
+    description += base::StringPrintf(" url = \"%s\"", url_list.c_str());
   }
   return description;
 }