Download filename determination refactor (3/3)

content/public/browser/download_item.h

Index: content/public/browser/download_item.h
diff --git a/content/public/browser/download_item.h b/content/public/browser/download_item.h
index e688b287ab942995bd3da4aada47161dff6529d4..70078dfb150d592d4decac619d64c0fdd0d8fee6 100644
--- a/content/public/browser/download_item.h
+++ b/content/public/browser/download_item.h
@@ -251,28 +251,19 @@ class CONTENT_EXPORT DownloadItem {
   // Called when the target path has been determined. |target_path| is the
   // suggested target path. |disposition| indicates how the target path should
   // be used (see TargetDisposition). |danger_type| is the danger level of
-  // |target_path| as determined by the caller. If |disposition| is
-  // TARGET_DISPOSITION_PROMPT, then OnTargetPathSelected() should be called
-  // subsequently with the user's selected target path.
-  virtual void OnTargetPathDetermined(
+  // |target_path| as determined by the caller. |intermediate_path| is the path
+  // to use to store the download until OnDownloadCompleting() is called.
+  virtual void OnDownloadTargetDetermined(
       const FilePath& target_path,
       TargetDisposition disposition,
-      content::DownloadDangerType danger_type) = 0;
-
-  // This method should be called if and only if OnTargetPathDetermined() was
-  // called previously with disposition set to TARGET_DISPOSITION_PROMPT.
-  // |target_path| is the path that the user selected after being prompted for a
-  // target path.
-  virtual void OnTargetPathSelected(const FilePath& target_path) = 0;
+      content::DownloadDangerType danger_type,
+      const FilePath& intermediate_path) = 0;
 
   // Called if a check of the download contents was performed and the results of
   // the test are available. This should only be called after AllDataSaved() is
   // true.
   virtual void OnContentCheckCompleted(DownloadDangerType danger_type) = 0;
 
-  virtual void OnIntermediatePathDetermined(DownloadFileManager* file_manager,
-                                            const FilePath& path) = 0;
-
   virtual void SetIsPersisted() = 0;
   virtual bool IsPersisted() const = 0;