Merge SavePackageFilePicker{,ChromeOS}

chrome/browser/download/download_prefs.h

Index: chrome/browser/download/download_prefs.h
diff --git a/chrome/browser/download/download_prefs.h b/chrome/browser/download/download_prefs.h
index 90ec566c947a2f63af7918c2a118acc3287f1d09..1de428341ed03e431f670c03e648275a72ed4862 100644
--- a/chrome/browser/download/download_prefs.h
+++ b/chrome/browser/download/download_prefs.h
@@ -35,7 +35,10 @@ class DownloadPrefs {
       content::BrowserContext* browser_context);
 
   base::FilePath DownloadPath() const;
+  base::FilePath SaveFilePath() const;
+  void SetSaveFilePath(const base::FilePath& path);
   int save_file_type() const { return *save_file_type_; }
+  void SetSaveFileType(int type);
 
   // Returns true if the prompt_for_download preference has been set and the
   // download location is not managed (which means the user shouldn't be able
@@ -68,6 +71,7 @@ class DownloadPrefs {
 
   BooleanPrefMember prompt_for_download_;
   FilePathPrefMember download_path_;
+  FilePathPrefMember save_file_path_;
   IntegerPrefMember save_file_type_;
 
   // Set of file extensions to open at download completion.