Revert 91861 - When the download folder does not exist, change the download folder to a user's "D...

chrome/browser/download/save_package.cc

 // Copyright (c) 2011 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.h"
 
 #include <algorithm>
 
 #include "base/file_path.h"
 #include "base/file_util.h"
@@ skipping 1238 matching lines @@
 
   // Get the directory from preference.
   FilePath save_file_path = prefs->GetFilePath(
       prefs::kSaveFileDefaultDirectory);
   DCHECK(!save_file_path.empty());
 
   return save_file_path;
 }
 
 void SavePackage::GetSaveInfo() {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
   // Can't use tab_contents_ in the file thread, so get the data that we need
   // before calling to it.
   PrefService* prefs = tab_contents()->profile()->GetPrefs();
   FilePath website_save_dir = GetSaveDirPreference(prefs);
   FilePath download_save_dir = prefs->GetFilePath(
       prefs::kDownloadDefaultDirectory);
   std::string mime_type = tab_contents()->contents_mime_type();
 
   BrowserThread::PostTask(
       BrowserThread::FILE, FROM_HERE,
       NewRunnableMethod(this, &SavePackage::CreateDirectoryOnFileThread,
-                        website_save_dir, download_save_dir, mime_type));
+          website_save_dir, download_save_dir, mime_type));
 }
 
 void SavePackage::CreateDirectoryOnFileThread(
     const FilePath& website_save_dir,
     const FilePath& download_save_dir,
     const std::string& mime_type) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
-
   FilePath save_dir;
-  FilePath default_download_dir =
-      download_util::GetDefaultDownloadDirectoryFromPathService();
-  // Ignores the returned value since the select file dialog should be
-  // displayed in any case.
-  download_util::ChooseSavableDirectory(
-      website_save_dir, download_save_dir, default_download_dir, &save_dir);
+  // If the default html/websites save folder doesn't exist...
+  if (!file_util::DirectoryExists(website_save_dir)) {
+    // If the default download dir doesn't exist, create it.
+    if (!file_util::DirectoryExists(download_save_dir))
+      file_util::CreateDirectory(download_save_dir);
+    save_dir = download_save_dir;
+  } else {
+    // If it does exist, use the default save dir param.
+    save_dir = website_save_dir;
+  }
 
   bool can_save_as_complete = CanSaveAsComplete(mime_type);
   FilePath suggested_filename = GetSuggestedNameForSaveAs(can_save_as_complete,
                                                           mime_type);
   FilePath::StringType pure_file_name =
       suggested_filename.RemoveExtension().BaseName().value();
   FilePath::StringType file_name_ext = suggested_filename.Extension();
 
   // Need to make sure the suggested file name is not too long.
   uint32 max_path = GetMaxPathLengthForDirectory(save_dir);
 
   if (GetSafePureFileName(save_dir, file_name_ext, max_path, &pure_file_name)) {
     save_dir = save_dir.Append(pure_file_name + file_name_ext);
   } else {
     // Cannot create a shorter filename. This will cause the save as operation
     // to fail unless the user pick a shorter name. Continuing even though it
     // will fail because returning means no save as popup for the user, which
     // is even more confusing. This case should be rare though.
     save_dir = save_dir.Append(suggested_filename);
   }
 
   BrowserThread::PostTask(
       BrowserThread::UI, FROM_HERE,
       NewRunnableMethod(this, &SavePackage::ContinueGetSaveInfo, save_dir,
                         can_save_as_complete));
 }
 
 void SavePackage::ContinueGetSaveInfo(const FilePath& suggested_path,
                                       bool can_save_as_complete) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
   // The TabContents which owns this SavePackage may have disappeared during
   // the UI->FILE->UI thread hop of
   // GetSaveInfo->CreateDirectoryOnFileThread->ContinueGetSaveInfo.
   if (!tab_contents())
     return;
   DownloadPrefs* download_prefs =
       tab_contents()->profile()->GetDownloadManager()->download_prefs();
   int file_type_index =
       SavePackageTypeToIndex(
           static_cast<SavePackageType>(download_prefs->save_file_type()));
@@ skipping 70 matching lines @@
                                     NULL);
   } else {
     // Just use 'suggested_path' instead of opening the dialog prompt.
     ContinueSave(suggested_path, file_type_index);
   }
 }
 
 // Called after the save file dialog box returns.
 void SavePackage::ContinueSave(const FilePath& final_name,
                                int index) {
-  DCHECK(BrowserThread::CurrentlyOn(BrowserThread::UI));
-
   // Ensure the filename is safe.
   saved_main_file_path_ = final_name;
   download_util::GenerateSafeFileName(tab_contents()->contents_mime_type(),
                                       &saved_main_file_path_);
 
   // The option index is not zero-based.
   DCHECK(index >= kSelectFileHtmlOnlyIndex &&
          index <= kSelectFileCompleteIndex);
 
   saved_main_directory_path_ = saved_main_file_path_.DirName();
@@ skipping 50 matching lines @@
 }
 
 // SelectFileDialog::Listener interface.
 void SavePackage::FileSelected(const FilePath& path,
                                int index, void* params) {
   ContinueSave(path, index);
 }
 
 void SavePackage::FileSelectionCanceled(void* params) {
 }