Use the user's preferred downloads directory for creating the initial download file.

content/browser/download/base_file.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 "content/browser/download/base_file.h"
 
 #include "base/bind.h"
 #include "base/file_util.h"
 #include "base/format_macros.h"
 #include "base/logging.h"
 #include "base/pickle.h"
 #include "base/stringprintf.h"
 #include "base/threading/thread_restrictions.h"
 #include "base/utf_string_conversions.h"
 #include "content/browser/download/download_net_log_parameters.h"
 #include "content/browser/download/download_stats.h"
 #include "content/public/browser/browser_thread.h"
-#include "content/public/browser/content_browser_client.h"
 #include "crypto/secure_hash.h"
 #include "net/base/file_stream.h"
 #include "net/base/net_errors.h"
 
 #if defined(OS_WIN)
 #include <windows.h>
 #include <shellapi.h>
 
 #include "content/browser/safe_util_win.h"
 #elif defined(OS_MACOSX)
@@ skipping 167 matching lines @@
   return MapShFileOperationCodes(result);
 }
 
 #endif
 
 }  // namespace
 
 // This will initialize the entire array to zero.
 const unsigned char BaseFile::kEmptySha256Hash[] = { 0 };
 
-BaseFile::BaseFile(const FilePath& full_path,
+BaseFile::BaseFile(const FilePath& download_directory,
+                   const FilePath& full_path,
                    const GURL& source_url,
                    const GURL& referrer_url,
                    int64 received_bytes,
                    bool calculate_hash,
                    const std::string& hash_state,
                    const linked_ptr<net::FileStream>& file_stream,
                    const net::BoundNetLog& bound_net_log)
-    : full_path_(full_path),
+    : download_directory_(download_directory),
+      full_path_(full_path),
       source_url_(source_url),
       referrer_url_(referrer_url),
       file_stream_(file_stream),
       bytes_so_far_(received_bytes),
       start_tick_(base::TimeTicks::Now()),
       calculate_hash_(calculate_hash),
       detached_(false),
       bound_net_log_(bound_net_log) {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   memcpy(sha256_hash_, kEmptySha256Hash, kSha256HashLen);
@@ skipping 16 matching lines @@
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   if (detached_)
     Close();
   else
     Cancel();  // Will delete the file.
 }
 
 net::Error BaseFile::Initialize() {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   DCHECK(!detached_);
+  DCHECK(!full_path_.empty() || !download_directory_.empty());
 
   if (full_path_.empty()) {
     FilePath temp_file;
-    FilePath download_dir =
-        content::GetContentClient()->browser()->GetDefaultDownloadDirectory();
-    if (!file_util::CreateTemporaryFileInDir(download_dir, &temp_file) &&
+    if (!file_util::CreateTemporaryFileInDir(download_directory_, &temp_file) &&
         !file_util::CreateTemporaryFile(&temp_file)) {
       return LOG_ERROR("unable to create", net::ERR_FILE_NOT_FOUND);
     }
     full_path_ = temp_file;
   }
 
   return Open();
 }
 
 net::Error BaseFile::AppendDataToFile(const char* data, size_t data_len) {
@@ skipping 284 matching lines @@
   base::TimeDelta diff = current_time - start_tick_;
   int64 diff_ms = diff.InMilliseconds();
   return diff_ms == 0 ? 0 : bytes_so_far() * 1000 / diff_ms;
 }
 
 int64 BaseFile::CurrentSpeed() const {
   DCHECK(BrowserThread::CurrentlyOn(BrowserThread::FILE));
   return CurrentSpeedAtTime(base::TimeTicks::Now());
 }