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

content/browser/download/download_manager_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.
 
 #include "content/browser/download/download_manager_impl.h"
 
 #include <iterator>
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ skipping 125 matching lines @@
 }
 
 class DownloadItemFactoryImpl : public DownloadItemFactory {
  public:
     DownloadItemFactoryImpl() {}
     virtual ~DownloadItemFactoryImpl() {}
 
     virtual DownloadItemImpl* CreatePersistedItem(
         DownloadItemImplDelegate* delegate,
         DownloadId download_id,
-        const FilePath& path,
-        const GURL& url,
+        const FilePath& current_path,
+        const FilePath& target_path,
+        const std::vector<GURL>& url_chain,
         const GURL& referrer_url,
         const base::Time& start_time,
         const base::Time& end_time,
         int64 received_bytes,
         int64 total_bytes,
         DownloadItem::DownloadState state,
+        DownloadInterruptReason interrupt_reason,
         bool opened,
         const net::BoundNetLog& bound_net_log) OVERRIDE {
       return new DownloadItemImpl(
           delegate,
           download_id,
-          path,
-          url,
+          current_path,
+          target_path,
+          url_chain,
           referrer_url,
           start_time,
           end_time,
           received_bytes,
           total_bytes,
           state,
+          interrupt_reason,
           opened,
           bound_net_log);
     }
 
     virtual DownloadItemImpl* CreateActiveItem(
         DownloadItemImplDelegate* delegate,
         const DownloadCreateInfo& info,
         scoped_ptr<DownloadRequestHandleInterface> request_handle,
         const net::BoundNetLog& bound_net_log) OVERRIDE {
       return new DownloadItemImpl(delegate, info, request_handle.Pass(),
@@ skipping 168 matching lines @@
     FilePath website_save_directory;      // Unused
     bool skip_dir_check = false;          // Unused
     delegate_->GetSaveDir(GetBrowserContext(), &website_save_directory,
                           &default_download_directory, &skip_dir_check);
   }
 
   // We create the DownloadItem before the DownloadFile because the
   // DownloadItem already needs to handle a state in which there is
   // no associated DownloadFile (history downloads, !IN_PROGRESS downloads)
   DownloadItemImpl* download =
-      CreateDownloadItem(info.get(), bound_net_log);
+      CreateDownloadItemInternal(info.get(), bound_net_log);
   scoped_ptr<DownloadFile> download_file(
       file_factory_->CreateFile(
           info->save_info.Pass(), default_download_directory,
           info->url(), info->referrer_url,
           delegate_->GenerateFileHash(),
           stream.Pass(), bound_net_log,
           download->DestinationObserverAsWeakPtr()));
   download->Start(download_file.Pass());
 
   // Delay notification until after Start() so that download_file is bound
@@ skipping 39 matching lines @@
 void DownloadManagerImpl::OnFileRemovalDetected(int32 download_id) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
   if (ContainsKey(downloads_, download_id))
     downloads_[download_id]->OnDownloadedFileRemoved();
 }
 
 BrowserContext* DownloadManagerImpl::GetBrowserContext() const {
   return browser_context_;
 }
 
-DownloadItemImpl* DownloadManagerImpl::CreateDownloadItem(
+DownloadItemImpl* DownloadManagerImpl::CreateDownloadItemInternal(
     DownloadCreateInfo* info, const net::BoundNetLog& bound_net_log) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
 
   if (!info->download_id.IsValid())
     info->download_id = GetNextId();
   DownloadItemImpl* download = item_factory_->CreateActiveItem(
       this, *info,
       scoped_ptr<DownloadRequestHandleInterface>(
           new DownloadRequestHandle(info->request_handle)).Pass(),
       bound_net_log);
@@ skipping 121 matching lines @@
 
 void DownloadManagerImpl::AddObserver(Observer* observer) {
   observers_.AddObserver(observer);
 }
 
 void DownloadManagerImpl::RemoveObserver(Observer* observer) {
   observers_.RemoveObserver(observer);
 }
 
 DownloadItem* DownloadManagerImpl::CreateDownloadItem(
-    const FilePath& path,
-    const GURL& url,
+    const FilePath& current_path,
+    const FilePath& target_path,
+    const std::vector<GURL>& url_chain,
     const GURL& referrer_url,
     const base::Time& start_time,
     const base::Time& end_time,
     int64 received_bytes,
     int64 total_bytes,
     DownloadItem::DownloadState state,
+    DownloadInterruptReason interrupt_reason,
     bool opened) {
   DownloadItemImpl* item = item_factory_->CreatePersistedItem(
       this,
       GetNextId(),
-      path,
-      url,
+      current_path,
+      target_path,
+      url_chain,
       referrer_url,
       start_time,
       end_time,
       received_bytes,
       total_bytes,
       state,
+      interrupt_reason,
       opened,
       net::BoundNetLog::Make(net_log_, net::NetLog::SOURCE_DOWNLOAD));
   DCHECK(!ContainsKey(downloads_, item->GetId()));
   downloads_[item->GetId()] = item;
   FOR_EACH_OBSERVER(Observer, observers_, OnDownloadCreated(this, item));
   VLOG(20) << __FUNCTION__ << "() download = " << item->DebugString(true);
   return item;
 }
 
 // TODO(asanka) Move into an observer.
@@ skipping 38 matching lines @@
        it != downloads_.end(); ++it) {
     DownloadItemImpl* item = it->second;
     if (item->IsComplete() &&
         !item->GetOpened())
       ++num_unopened;
   }
   RecordOpensOutstanding(num_unopened);
 }
 
 }  // namespace content