Merge SavePackageFilePicker{,ChromeOS}

chrome/browser/download/save_package_file_picker_chromeos.h

Index: chrome/browser/download/save_package_file_picker_chromeos.h
diff --git a/chrome/browser/download/save_package_file_picker_chromeos.h b/chrome/browser/download/save_package_file_picker_chromeos.h
index 42f3320cba43bf38b421aa7d7212b6038dafb49c..ce1e7c80385a07ecf8f55604139197e3f117be45 100644
--- a/chrome/browser/download/save_package_file_picker_chromeos.h
+++ b/chrome/browser/download/save_package_file_picker_chromeos.h
@@ -23,6 +23,7 @@ class SavePackageFilePickerChromeOS : public ui::SelectFileDialog::Listener,
       content::WebContents* web_contents,
       const base::FilePath& suggested_path,
       bool is_html,
+      const base::Callback<void(const base::FilePath&)>& on_chosen,
       const content::SavePackagePathPickedCallback& callback);
 
   // Used to disable prompting the user for a directory/filename of the saved
@@ -42,8 +43,9 @@ class SavePackageFilePickerChromeOS : public ui::SelectFileDialog::Listener,
       void* unused_params) OVERRIDE;
   virtual void FileSelectionCanceled(void* params) OVERRIDE;
 
+  base::Callback<void(const base::FilePath&)> on_chosen_;
   content::SavePackagePathPickedCallback callback_;
-  bool is_html_;
+  content::SavePageType save_type_;
 
   // For managing select file dialogs.
   scoped_refptr<ui::SelectFileDialog> select_file_dialog_;