Remove Windows "Save As" dialogs from Save Page code....

chrome/browser/tab_contents/web_contents.cc

 // Copyright (c) 2006-2008 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/tab_contents/web_contents.h"
 
 #include "base/command_line.h"
 #include "base/compiler_specific.h"
 #include "base/file_version_info.h"
 #include "base/process_util.h"
@@ skipping 635 matching lines @@
 void WebContents::OnSavePage() {
   // If we can not save the page, try to download it.
   if (!SavePackage::IsSavableContents(contents_mime_type())) {
     DownloadManager* dlm = profile()->GetDownloadManager();
     const GURL& current_page_url = GetURL();
     if (dlm && current_page_url.is_valid())
       dlm->DownloadUrl(current_page_url, GURL(), this);
     return;
   }
 
-  // Get our user preference state.
-  PrefService* prefs = profile()->GetPrefs();
-  DCHECK(prefs);
+  Stop();
 
-  FilePath suggest_name = SavePackage::GetSuggestNameForSaveAs(prefs,
-      FilePath::FromWStringHack(UTF16ToWideHack(GetTitle())));
-
-  SavePackage::SavePackageParam param(contents_mime_type());
-  param.prefs = prefs;
-
-  // TODO(rocking): Use new asynchronous dialog boxes to prevent the SaveAs
-  // dialog blocking the UI thread. See bug: http://b/issue?id=1129694.
-  if (SavePackage::GetSaveInfo(suggest_name, view_->GetNativeView(),
-                               &param, profile()->GetDownloadManager())) {
-    SavePage(param.saved_main_file_path.ToWStringHack(),
-             param.dir.ToWStringHack(),
-             param.save_type);
-  }
+  // Create the save package and possibly prompt the user for the name to save
+  // the page as. The user prompt is an asynchronous operation that runs on
+  // another thread.
+  save_package_ = new SavePackage(this);
+  save_package_->GetSaveInfo();
 }
 
+// Used in automated testing to bypass prompting the user for file names.
+// Instead, the names and paths are hard coded rather than running them through
+// file name sanitation and extension / mime checking.
 void WebContents::SavePage(const std::wstring& main_file,
                            const std::wstring& dir_path,
                            SavePackage::SavePackageType save_type) {
   // Stop the page from navigating.
   Stop();
 
   save_package_ = new SavePackage(this, save_type,
                                   FilePath::FromWStringHack(main_file),
                                   FilePath::FromWStringHack(dir_path));
   save_package_->Init();
@@ skipping 464 matching lines @@
 
 void WebContents::RunFileChooser(bool multiple_files,
                                  const std::wstring& title,
                                  const std::wstring& default_file,
                                  const std::wstring& filter) {
   if (!select_file_dialog_.get())
     select_file_dialog_ = SelectFileDialog::Create(this);
   SelectFileDialog::Type dialog_type =
     multiple_files ? SelectFileDialog::SELECT_OPEN_MULTI_FILE :
                      SelectFileDialog::SELECT_OPEN_FILE;
-  select_file_dialog_->SelectFile(dialog_type, title, default_file, filter,
-                                  std::wstring(),
+  select_file_dialog_->SelectFile(dialog_type, title, default_file,
+                                  filter, 0, std::wstring(),
                                   view_->GetTopLevelNativeWindow(), NULL);
 }
 
 void WebContents::RunJavaScriptMessage(
     const std::wstring& message,
     const std::wstring& default_prompt,
     const GURL& frame_url,
     const int flags,
     IPC::Message* reply_msg,
     bool* did_suppress_message) {
@@ skipping 394 matching lines @@
       Details<FindNotificationDetails>(&find_result_));
 }
 
 bool WebContents::CanTerminate() const {
   if (!delegate())
     return true;
 
   return !delegate()->IsExternalTabContainer();
 }
 
-void WebContents::FileSelected(const std::wstring& path, void* params) {
+void WebContents::FileSelected(const std::wstring& path,
+                               int index, void* params) {
   render_view_host()->FileSelected(path);
 }
 
 void WebContents::MultiFilesSelected(const std::vector<std::wstring>& files,
                                      void* params) {
   render_view_host()->MultiFilesSelected(files);
 }
 
 void WebContents::FileSelectionCanceled(void* params) {
   // If the user cancels choosing a file to upload we pass back an
@@ skipping 450 matching lines @@
   //    -> Use pending DOM UI if any.
   //
   //  - Normal state with no load: committed nav entry + no pending nav entry:
   //    -> Use committed DOM UI.
   if (controller()->GetPendingEntry() &&
       (controller()->GetLastCommittedEntry() ||
        render_manager_.pending_dom_ui()))
     return render_manager_.pending_dom_ui();
   return render_manager_.dom_ui();
 }