When the download folder does not exist, change the download folder to a user's "Downloads"

chrome/browser/download/save_package.cc

Index: chrome/browser/download/save_package.cc
diff --git a/chrome/browser/download/save_package.cc b/chrome/browser/download/save_package.cc
index 81bdfcfdfe5a2dd5d252165196836d0e304fa532..59f8b127191a3d595a81097bc19a5d05421d6ec9 100644
--- a/chrome/browser/download/save_package.cc
+++ b/chrome/browser/download/save_package.cc
@@ -11,6 +11,7 @@
 #include "base/i18n/file_util_icu.h"
 #include "base/logging.h"
 #include "base/message_loop.h"
+#include "base/path_service.h"
 #include "base/stl_util-inl.h"
 #include "base/string_piece.h"
 #include "base/string_split.h"
@@ -1267,7 +1268,22 @@ void SavePackage::GetSaveInfo() {
   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::GetSaveInfo(const FilePath& website_save_dir,

[Randy Smith (Not in Mondays), 2011/05/31 23:03:10]

It's a minor point, but it would seem relatively easy to share code between this
function and the variation without arguments.

[haraken1, 2011/06/02 09:13:22]

I removed this GetSaveInfo(). Instead, I added
DownloadTabHelper::ChangeSaveDirectoryPrefs() and
DownloadTabHelper::RestoreSaveDirectoryPrefs(). As I commented in
download_tab_helper.h, if we want to change the default folder preferences used
for some tests, then 

(1) call ChangeSaveDirectoryPrefs() to change the preferences
(2) call GetSaveInfo(), which will use the prefs that we set in (1)
(3) call RestoreSaveDirectoryPrefs() to restore the preferences

+                              const FilePath& download_save_dir,
+                              SavePackageType save_type) {
+  PrefService* prefs = tab_contents()->profile()->GetPrefs();
+  // Ignore the return value
+  GetSaveDirPreference(prefs);

[Randy Smith (Not in Mondays), 2011/05/31 23:03:10]

Could you document the side effect for which you're calling this function? 
Naively, it looks like a function that wouldn't have side effects.

[haraken1, 2011/06/02 09:13:22]

This is now unnecessary since I removed this code. 

+  prefs->SetInteger(prefs::kSaveFileType, save_type);

[Randy Smith (Not in Mondays), 2011/05/31 23:03:10]

This looks like a global state change that isn't documented/suggested in the
header file comment.  Could you at least document why we're doing that here?  (I
might want to ask you to separate the global state change out from this function
after I understand better its purpose.)

[haraken1, 2011/06/02 09:13:22]

This is now unnecessary since I removed this code. 

+  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));
 }
 
 void SavePackage::CreateDirectoryOnFileThread(
@@ -1275,15 +1291,26 @@ void SavePackage::CreateDirectoryOnFileThread(
     const FilePath& download_save_dir,
     const std::string& mime_type) {
   FilePath 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);
+  if (file_util::DirectoryExists(website_save_dir)) {
+    // If the default html/websites save folder exists,
+    // then use the default html/websites save folder.
+    save_dir = website_save_dir;
+  } else if (file_util::DirectoryExists(download_save_dir)) {
+    // If the default html/websites save folder does not exist
+    // but the default download folder exists,
+    // then use the default download folder.
     save_dir = download_save_dir;
   } else {
-    // If it does exist, use the default save dir param.
-    save_dir = website_save_dir;
+    // If both the above folders do not exist,
+    // use the user's "Downloads" folder.
+    if (!PathService::Get(chrome::DIR_DEFAULT_DOWNLOADS, &save_dir)) {
+      // Create the |download_save_dir| folder if we cannot get
+      // DIR_DEFAULT_DOWNLOADS (This will be a rare case).
+      save_dir = download_save_dir;
+    }
+    // Make sure that the folder does exist.
+    if (!file_util::CreateDirectory(save_dir))
+      LOG(ERROR) << "Failed to create " << save_dir.value();
   }
 
   bool can_save_as_complete = CanSaveAsComplete(mime_type);