summaryrefslogtreecommitdiff
path: root/chromium/content/browser/download/base_file.cc
diff options
context:
space:
mode:
authorAndras Becsi <andras.becsi@digia.com>2014-03-18 13:16:26 +0100
committerFrederik Gladhorn <frederik.gladhorn@digia.com>2014-03-20 15:55:39 +0100
commit3f0f86b0caed75241fa71c95a5d73bc0164348c5 (patch)
tree92b9fb00f2e9e90b0be2262093876d4f43b6cd13 /chromium/content/browser/download/base_file.cc
parente90d7c4b152c56919d963987e2503f9909a666d2 (diff)
downloadqtwebengine-chromium-3f0f86b0caed75241fa71c95a5d73bc0164348c5.tar.gz
Update to new stable branch 1750
This also includes an updated ninja and chromium dependencies needed on Windows. Change-Id: Icd597d80ed3fa4425933c9f1334c3c2e31291c42 Reviewed-by: Zoltan Arvai <zarvai@inf.u-szeged.hu> Reviewed-by: Zeno Albisser <zeno.albisser@digia.com>
Diffstat (limited to 'chromium/content/browser/download/base_file.cc')
-rw-r--r--chromium/content/browser/download/base_file.cc6
1 files changed, 3 insertions, 3 deletions
diff --git a/chromium/content/browser/download/base_file.cc b/chromium/content/browser/download/base_file.cc
index 90ab485c361..1de3e842dd8 100644
--- a/chromium/content/browser/download/base_file.cc
+++ b/chromium/content/browser/download/base_file.cc
@@ -82,8 +82,8 @@ DownloadInterruptReason BaseFile::Initialize(
// |initial_directory| can still be empty if ContentBrowserClient returned
// an empty path for the downloads directory.
if ((initial_directory.empty() ||
- !file_util::CreateTemporaryFileInDir(initial_directory, &temp_file)) &&
- !file_util::CreateTemporaryFile(&temp_file)) {
+ !base::CreateTemporaryFileInDir(initial_directory, &temp_file)) &&
+ !base::CreateTemporaryFile(&temp_file)) {
return LogInterruptReason("Unable to create", 0,
DOWNLOAD_INTERRUPT_REASON_FILE_FAILED);
}
@@ -165,7 +165,7 @@ DownloadInterruptReason BaseFile::Rename(const base::FilePath& new_path) {
net::NetLog::TYPE_DOWNLOAD_FILE_RENAMED,
base::Bind(&FileRenamedNetLogCallback, &full_path_, &new_path));
Close();
- file_util::CreateDirectory(new_path.DirName());
+ base::CreateDirectory(new_path.DirName());
// A simple rename wouldn't work here since we want the file to have
// permissions / security descriptors that makes sense in the new directory.