Merge SavePackageFilePicker{,ChromeOS}

chrome/browser/download/chrome_download_manager_delegate.h

Index: chrome/browser/download/chrome_download_manager_delegate.h
diff --git a/chrome/browser/download/chrome_download_manager_delegate.h b/chrome/browser/download/chrome_download_manager_delegate.h
index 6b6db88ba562f5694c857be38841df70467c4a81..d82fbcd5754bee1172f4a124c3e658d59bc39351 100644
--- a/chrome/browser/download/chrome_download_manager_delegate.h
+++ b/chrome/browser/download/chrome_download_manager_delegate.h
@@ -53,8 +53,6 @@ class ChromeDownloadManagerDelegate
  public:
   explicit ChromeDownloadManagerDelegate(Profile* profile);
 
-  static void RegisterUserPrefs(user_prefs::PrefRegistrySyncable* registry);
-
   // Should be called before the first call to ShouldCompleteDownload() to
   // disable SafeBrowsing checks for |item|.
   static void DisableSafeBrowsing(content::DownloadItem* item);
@@ -92,10 +90,6 @@ class ChromeDownloadManagerDelegate
       content::DownloadItem* download,
       const content::CheckForFileExistenceCallback& callback) OVERRIDE;
 
-  // Clears the last directory chosen by the user in response to a file chooser
-  // prompt. Called when clearing recent history.
-  void ClearLastDownloadPath();
-
   DownloadPrefs* download_prefs() { return download_prefs_.get(); }
 
  protected:
@@ -133,11 +127,6 @@ class ChromeDownloadManagerDelegate
       const base::FilePath& suggested_virtual_path,
       const CheckDownloadUrlCallback& callback) OVERRIDE;
 
-  // Callback invoked by the DownloadFilePicker after PromptUserForDownloadPath.
-  void OnDownloadPathSelected(
-      const DownloadTargetDeterminerDelegate::FileSelectedCallback& callback,
-      const base::FilePath& virtual_path);
-
  private:
   friend class base::RefCountedThreadSafe<ChromeDownloadManagerDelegate>;
 
@@ -170,10 +159,6 @@ class ChromeDownloadManagerDelegate
 
   content::NotificationRegistrar registrar_;
 
-  // The directory most recently chosen by the user in response to a Save As
-  // dialog for a regular download.
-  base::FilePath last_download_path_;
-
   DISALLOW_COPY_AND_ASSIGN(ChromeDownloadManagerDelegate);
 };