Merge SavePackageFilePicker{,ChromeOS}

chrome/browser/download/download_prefs.h

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CHROME_BROWSER_DOWNLOAD_DOWNLOAD_PREFS_H_
 #define CHROME_BROWSER_DOWNLOAD_DOWNLOAD_PREFS_H_
 
 #include <set>
 
 #include "base/files/file_path.h"
@@ skipping 17 matching lines @@
   static void RegisterUserPrefs(PrefRegistrySyncable* registry);
 
   // Returns the DownloadPrefs corresponding to the given DownloadManager
   // or BrowserContext.
   static DownloadPrefs* FromDownloadManager(
       content::DownloadManager* download_manager);
   static DownloadPrefs* FromBrowserContext(
       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
   // to choose another download location).
   bool PromptForDownload() const;
 
   // Returns true if the download path preference is managed.
   bool IsDownloadPathManaged() const;
 
   // Returns true if there is at least one file extension registered
@@ skipping 12 matching lines @@
 
   void ResetAutoOpen();
 
  private:
   void SaveAutoOpenState();
 
   Profile* profile_;
 
   BooleanPrefMember prompt_for_download_;
   FilePathPrefMember download_path_;
+  FilePathPrefMember save_file_path_;
   IntegerPrefMember save_file_type_;
 
   // Set of file extensions to open at download completion.
   struct AutoOpenCompareFunctor {
     bool operator()(const base::FilePath::StringType& a,
                     const base::FilePath::StringType& b) const;
   };
   typedef std::set<base::FilePath::StringType,
                    AutoOpenCompareFunctor> AutoOpenSet;
   AutoOpenSet auto_open_;
 
   DISALLOW_COPY_AND_ASSIGN(DownloadPrefs);
 };
 
 #endif  // CHROME_BROWSER_DOWNLOAD_DOWNLOAD_PREFS_H_