Persist download interrupt reason, both target and current paths, and url_chain.

content/browser/download/download_item_impl.cc

 // Copyright (c) 2012 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.
 
 // File method ordering: Methods in this file are in the same order as
 // in download_item_impl.h, with the following exception: The public
 // interfaces Start, MaybeCompleteDownload, and OnDownloadCompleting
 // are placed in chronological order with the other (private) routines
 // that together define a DownloadItem's state transitions
 // as the download progresses.  See "Download progression cascade" later in
@@ skipping 114 matching lines @@
 // database handles in incognito mode starting at -1 and progressively getting
 // more negative.
 
 // Constructor for reading from the history service.
 DownloadItemImpl::DownloadItemImpl(DownloadItemImplDelegate* delegate,
                                    DownloadId download_id,
                                    const DownloadPersistentStoreInfo& info,
                                    const net::BoundNetLog& bound_net_log)
     : is_save_package_download_(false),
       download_id_(download_id),
-      current_path_(info.path),
-      target_path_(info.path),
+      current_path_(info.current_path),
+      target_path_(info.target_path),
       target_disposition_(TARGET_DISPOSITION_OVERWRITE),
-      url_chain_(1, info.url),
+      url_chain_(info.url_chain),
       referrer_url_(info.referrer_url),
       transition_type_(PAGE_TRANSITION_LINK),
       has_user_gesture_(false),
       total_bytes_(info.total_bytes),
       received_bytes_(info.received_bytes),
       bytes_per_sec_(0),
       last_reason_(DOWNLOAD_INTERRUPT_REASON_NONE),
       start_tick_(base::TimeTicks()),
       state_(ExternalToInternalState(info.state)),
       danger_type_(DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS),
@@ skipping 544 matching lines @@
 bool DownloadItemImpl::GetAutoOpened() {
   return auto_opened_;
 }
 
 bool DownloadItemImpl::GetOpened() const {
   return opened_;
 }
 
 DownloadPersistentStoreInfo DownloadItemImpl::GetPersistentStoreInfo() const {
   // TODO(asanka): Persist GetTargetFilePath() as well.
-  return DownloadPersistentStoreInfo(GetFullPath(),
-                                     GetURL(),
+  return DownloadPersistentStoreInfo(GetTargetFilePath(),
+                                     GetFullPath(),
+                                     GetUrlChain(),
                                      GetReferrerUrl(),
                                      GetStartTime(),
                                      GetEndTime(),
                                      GetReceivedBytes(),
                                      GetTotalBytes(),
                                      GetState(),
+                                     GetLastReason(),
                                      GetDbHandle(),
                                      GetOpened());
 }
 
 BrowserContext* DownloadItemImpl::GetBrowserContext() const {
   return delegate_->GetBrowserContext();
 }
 
 WebContents* DownloadItemImpl::GetWebContents() const {
   // TODO(rdsmith): Remove null check after removing GetWebContents() from
@@ skipping 728 matching lines @@
       return "CANCELLED";
     case INTERRUPTED_INTERNAL:
       return "INTERRUPTED";
     default:
       NOTREACHED() << "Unknown download state " << state;
       return "unknown";
   };
 }
 
 }  // namespace content