Merge from Chromium at DEPS revision r190564

This commit was generated by merge_to_master.py.

Change-Id: Icadecbce29854b8fa25fd335b2c1949b5ca5d170

1 files changed, 10 insertions, 14 deletions

diff --git a/content/browser/download/download_item_impl_delegate.cc b/content/browser/download/download_item_impl_delegate.cc
index 048b35bedc..7f0ab3fc2a 100644
--- a/content/browser/download/download_item_impl_delegate.cc
+++ b/content/browser/download/download_item_impl_delegate.cc
@@ -30,17 +30,17 @@ void DownloadItemImplDelegate::Detach() {
 void DownloadItemImplDelegate::DetermineDownloadTarget(
     DownloadItemImpl* download, const DownloadTargetCallback& callback) {
   // TODO(rdsmith/asanka): Do something useful if forced file path is null.
-  FilePath target_path(download->GetForcedFilePath());
+  base::FilePath target_path(download->GetForcedFilePath());
   callback.Run(target_path,
                DownloadItem::TARGET_DISPOSITION_OVERWRITE,
                DOWNLOAD_DANGER_TYPE_NOT_DANGEROUS,
                target_path);
 }
 
-void DownloadItemImplDelegate::ReadyForDownloadCompletion(
+bool DownloadItemImplDelegate::ShouldCompleteDownload(
     DownloadItemImpl* download,
     const base::Closure& complete_callback) {
-  complete_callback.Run();
+  return true;
 }
 
 bool DownloadItemImplDelegate::ShouldOpenDownload(
@@ -49,33 +49,29 @@ bool DownloadItemImplDelegate::ShouldOpenDownload(
 }
 
 bool DownloadItemImplDelegate::ShouldOpenFileBasedOnExtension(
-    const FilePath& path) {
+    const base::FilePath& path) {
   return false;
 }
 
 void DownloadItemImplDelegate::CheckForFileRemoval(
     DownloadItemImpl* download_item) {}
 
+void DownloadItemImplDelegate::ResumeInterruptedDownload(
+    scoped_ptr<DownloadUrlParameters> params, content::DownloadId id) {}
+
 BrowserContext* DownloadItemImplDelegate::GetBrowserContext() const {
   return NULL;
 }
 
 void DownloadItemImplDelegate::UpdatePersistence(DownloadItemImpl* download) {}
 
-void DownloadItemImplDelegate::DownloadStopped(DownloadItemImpl* download) {}
-
-void DownloadItemImplDelegate::DownloadCompleted(DownloadItemImpl* download) {}
+void DownloadItemImplDelegate::OpenDownload(DownloadItemImpl* download) {}
 
-void DownloadItemImplDelegate::DownloadOpened(DownloadItemImpl* download) {}
+void DownloadItemImplDelegate::ShowDownloadInShell(DownloadItemImpl* download) {
+}
 
 void DownloadItemImplDelegate::DownloadRemoved(DownloadItemImpl* download) {}
 
-void DownloadItemImplDelegate::DownloadRenamedToIntermediateName(
-    DownloadItemImpl* download) {}
-
-void DownloadItemImplDelegate::DownloadRenamedToFinalName(
-    DownloadItemImpl* download) {}
-
 void DownloadItemImplDelegate::AssertStateConsistent(
     DownloadItemImpl* download) const {}