Merge from Chromium at DEPS revision r190564

This commit was generated by merge_to_master.py.

Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170

1 files changed, 20 insertions, 5 deletions

diff --git a/content/browser/download/download_item_factory.h b/content/browser/download/download_item_factory.h
index 500f491fbd..2e42c45761 100644
--- a/content/browser/download/download_item_factory.h
+++ b/content/browser/download/download_item_factory.h
@@ -10,13 +10,18 @@
 #define CONTENT_BROWSER_DOWNLOAD_DOWNLOAD_ITEM_FACTORY_H_
 
 #include <string>
+#include <vector>
 
 #include "base/memory/scoped_ptr.h"
 #include "content/public/browser/download_id.h"
+#include "content/public/browser/download_item.h"
 
-class FilePath;
 class GURL;
 
+namespace base {
+class FilePath;
+}
+
 namespace net {
 class BoundNetLog;
 }
@@ -28,7 +33,6 @@ class DownloadItemImpl;
 class DownloadItemImplDelegate;
 class DownloadRequestHandleInterface;
 struct DownloadCreateInfo;
-struct DownloadPersistentStoreInfo;
 
 class DownloadItemFactory {
 public:
@@ -37,21 +41,32 @@ public:
   virtual DownloadItemImpl* CreatePersistedItem(
       DownloadItemImplDelegate* delegate,
       DownloadId download_id,
-      const DownloadPersistentStoreInfo& info,
+      const base::FilePath& current_path,
+      const base::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,
+      DownloadDangerType danger_type,
+      DownloadInterruptReason interrupt_reason,
+      bool opened,
       const net::BoundNetLog& bound_net_log) = 0;
 
   virtual DownloadItemImpl* CreateActiveItem(
       DownloadItemImplDelegate* delegate,
       const DownloadCreateInfo& info,
-      scoped_ptr<DownloadRequestHandleInterface> request_handle,
       const net::BoundNetLog& bound_net_log) = 0;
 
   virtual DownloadItemImpl* CreateSavePageItem(
       DownloadItemImplDelegate* delegate,
-      const FilePath& path,
+      const base::FilePath& path,
       const GURL& url,
       DownloadId download_id,
       const std::string& mime_type,
+      scoped_ptr<DownloadRequestHandleInterface> request_handle,
       const net::BoundNetLog& bound_net_log) = 0;
 };