SavePackageFilePickerChromeOS should only force MHTML when saving HTML, not when saving text/image/…

chrome/browser/download/save_package_file_picker_chromeos.cc

 // 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.
 
 #include "chrome/browser/download/save_package_file_picker_chromeos.h"
 
 #include "base/bind.h"
 #include "base/bind_helpers.h"
 #include "base/i18n/file_util_icu.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "chrome/browser/chromeos/drive/drive_download_handler.h"
 #include "chrome/browser/chromeos/drive/drive_file_system_util.h"
 #include "chrome/browser/platform_util.h"
 #include "chrome/browser/profiles/profile_manager.h"
 #include "chrome/browser/ui/chrome_select_file_policy.h"
 #include "content/public/browser/download_item.h"
 #include "content/public/browser/web_contents.h"
 #include "content/public/browser/web_contents_view.h"
 #include "ui/shell_dialogs/selected_file_info.h"
 
 namespace {
 
 // If false, we don't prompt the user as to where to save the file.  This
 // exists only for testing.
 bool g_should_prompt_for_filename = true;
 
 // Trampoline callback between SubstituteDriveDownloadPath() and |callback|.
 void ContinueSettingUpDriveDownload(
     const content::SavePackagePathPickedCallback& callback,
+    bool is_html,
     Profile* profile,
     const base::FilePath& drive_path,
     const base::FilePath& drive_tmp_download_path) {
   if (drive_tmp_download_path.empty())  // Substitution failed.
     return;
 
   callback.Run(
-      drive_tmp_download_path, content::SAVE_PAGE_TYPE_AS_MHTML,
+      drive_tmp_download_path,
+      (is_html ?
+       content::SAVE_PAGE_TYPE_AS_MHTML :
+       content::SAVE_PAGE_TYPE_AS_ONLY_HTML),
       base::Bind(&drive::DriveDownloadHandler::SetDownloadParams,
                  base::Unretained(
                      drive::DriveDownloadHandler::GetForProfile(profile)),
                  drive_path));
 }
 
 }  // namespace
 
 SavePackageFilePickerChromeOS::SavePackageFilePickerChromeOS(
     content::WebContents* web_contents,
     const base::FilePath& suggested_path,
+    bool is_html,
     const content::SavePackagePathPickedCallback& callback)
     : content::WebContentsObserver(web_contents),
-      callback_(callback) {
+      callback_(callback),
+      is_html_(is_html) {
+  base::FilePath suggested_path_copy(is_html_ ?
+                                     suggested_path.ReplaceExtension("mhtml") :
+                                     suggested_path);
   if (g_should_prompt_for_filename) {
     select_file_dialog_ = ui::SelectFileDialog::Create(
         this, new ChromeSelectFilePolicy(web_contents));
     ui::SelectFileDialog::FileTypeInfo file_types;
     file_types.support_drive = true;
     select_file_dialog_->SelectFile(
         ui::SelectFileDialog::SELECT_SAVEAS_FILE,
         string16(),
-        suggested_path.ReplaceExtension("mhtml"),
+        suggested_path_copy,
         &file_types,
         0,
-        "mhtml",
+        suggested_path_copy.Extension(),
         platform_util::GetTopLevel(web_contents->GetView()->GetNativeView()),
         NULL);
   } else {
-    FileSelected(suggested_path.ReplaceExtension("mhtml"), 0, NULL);
+    FileSelected(suggested_path_copy, 0, NULL);
   }
 }
 
 void SavePackageFilePickerChromeOS::SetShouldPromptUser(bool should_prompt) {
   g_should_prompt_for_filename = should_prompt;
 }
 
 SavePackageFilePickerChromeOS::~SavePackageFilePickerChromeOS() {
 }
 
@@ skipping 27 matching lines @@
     //   ContinueSettingUpDriveDownload ->
     //     callback_ = SavePackage::OnPathPicked ->
     //       download_created_callback = OnSavePackageDownloadCreated
     drive::DriveDownloadHandler* drive_download_handler =
         drive::DriveDownloadHandler::GetForProfile(profile);
     DCHECK(drive_download_handler);
     drive_download_handler->
         SubstituteDriveDownloadPath(selected_path, NULL,
                                     base::Bind(&ContinueSettingUpDriveDownload,
                                                callback_,
+                                               is_html_,
                                                profile,
                                                selected_path));
   } else {
-    callback_.Run(selected_path, content::SAVE_PAGE_TYPE_AS_MHTML,
+    callback_.Run(selected_path,
+                  (is_html_ ?
+                   content::SAVE_PAGE_TYPE_AS_MHTML :
+                   content::SAVE_PAGE_TYPE_AS_ONLY_HTML),
                   content::SavePackageDownloadCreatedCallback());
   }
   delete this;
 }
 
 void SavePackageFilePickerChromeOS::FileSelectionCanceled(void* params) {
   delete this;
 }