WIP - Refactor programmatic downloads

content/browser/download/download_create_info.cc

Index: content/browser/download/download_create_info.cc
diff --git a/content/browser/download/download_create_info.cc b/content/browser/download/download_create_info.cc
index 8c47cabd038064be28085248c14968d353a791b6..30cc4d27fb393ccf958ac0d71056a0af3bc3423a 100644
--- a/content/browser/download/download_create_info.cc
+++ b/content/browser/download/download_create_info.cc
@@ -8,46 +8,42 @@
 
 #include "base/format_macros.h"
 #include "base/strings/stringprintf.h"
+#include "content/browser/byte_stream.h"
+#include "content/public/browser/download_save_info.h"
 
 namespace content {
 
-DownloadCreateInfo::DownloadCreateInfo(
-    const base::Time& start_time,
-    int64 total_bytes,
-    const net::BoundNetLog& bound_net_log,
-    bool has_user_gesture,
-    PageTransition transition_type)
-    : start_time(start_time),
+DownloadCreateInfo::DownloadCreateInfo(const base::Time& start_time,
+                                       int64 total_bytes,
+                                       const net::BoundNetLog& bound_net_log,
+                                       bool has_user_gesture,
+                                       PageTransition transition_type,
+                                       scoped_ptr<DownloadSaveInfo> save_info)
+    : is_save_package_download(false),
+      start_time(start_time),
       total_bytes(total_bytes),
-      download_id(DownloadItem::kInvalidId),
       has_user_gesture(has_user_gesture),
       transition_type(transition_type),
-      save_info(new DownloadSaveInfo()),
-      request_bound_net_log(bound_net_log) {
-}
+      save_info(save_info.Pass()),
+      request_bound_net_log(bound_net_log) {}
 
 DownloadCreateInfo::DownloadCreateInfo()
-    : total_bytes(0),
-      download_id(DownloadItem::kInvalidId),
+    : is_save_package_download(false),
+      total_bytes(0),
       has_user_gesture(false),
       transition_type(PAGE_TRANSITION_LINK),
-      save_info(new DownloadSaveInfo()) {
-}
+      save_info(new DownloadSaveInfo()) {}
 
 DownloadCreateInfo::~DownloadCreateInfo() {
 }
 
 std::string DownloadCreateInfo::DebugString() const {
-  return base::StringPrintf("{"
-                            " download_id = %u"
-                            " url = \"%s\""
-                            " request_handle = %s"
-                            " total_bytes = %" PRId64
-                            " }",
-                            download_id,
-                            url().spec().c_str(),
-                            request_handle.DebugString().c_str(),
-                            total_bytes);
+  return base::StringPrintf(
+      "{"
+      " url = \"%s\""
+      " total_bytes = %" PRId64 " }",
+      url().spec().c_str(),
+      total_bytes);
 }
 
 const GURL& DownloadCreateInfo::url() const {