Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(697)

Unified Diff: content/browser/fileapi/copy_or_move_operation_delegate_unittest.cc

Issue 206073006: Revert of Add a parameter to FileStreamWriter::CreateForLocalFile to allow creating new (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Created 6 years, 9 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
Index: content/browser/fileapi/copy_or_move_operation_delegate_unittest.cc
diff --git a/content/browser/fileapi/copy_or_move_operation_delegate_unittest.cc b/content/browser/fileapi/copy_or_move_operation_delegate_unittest.cc
index d5192a815101aed4fe3af345599448e9e26b620a..1b7abf9852bcdbe714b4d13091f0d20a6a8d8a59 100644
--- a/content/browser/fileapi/copy_or_move_operation_delegate_unittest.cc
+++ b/content/browser/fileapi/copy_or_move_operation_delegate_unittest.cc
@@ -718,10 +718,13 @@
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
base::FilePath source_path = temp_dir.path().AppendASCII("source");
- base::FilePath dest_path = temp_dir.path().AppendASCII("dest");
const char kTestData[] = "abcdefghijklmnopqrstuvwxyz0123456789";
base::WriteFile(source_path, kTestData,
arraysize(kTestData) - 1); // Exclude trailing '\0'.
+
+ base::FilePath dest_path = temp_dir.path().AppendASCII("dest");
+ // LocalFileWriter requires the file exists. So create an empty file here.
+ base::WriteFile(dest_path, "", 0);
base::MessageLoopForIO message_loop;
base::Thread file_thread("file_thread");
@@ -736,8 +739,8 @@
webkit_blob::FileStreamReader::CreateForLocalFile(
task_runner.get(), source_path, 0, base::Time()));
- scoped_ptr<FileStreamWriter> writer(FileStreamWriter::CreateForLocalFile(
- task_runner.get(), dest_path, 0, FileStreamWriter::CREATE_NEW_FILE));
+ scoped_ptr<FileStreamWriter> writer(
+ FileStreamWriter::CreateForLocalFile(task_runner.get(), dest_path, 0));
std::vector<int64> progress;
CopyOrMoveOperationDelegate::StreamCopyHelper helper(
@@ -773,11 +776,13 @@
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
base::FilePath source_path = temp_dir.path().AppendASCII("source");
- base::FilePath dest_path = temp_dir.path().AppendASCII("dest");
const char kTestData[] = "abcdefghijklmnopqrstuvwxyz0123456789";
base::WriteFile(source_path, kTestData,
arraysize(kTestData) - 1); // Exclude trailing '\0'.
+ base::FilePath dest_path = temp_dir.path().AppendASCII("dest");
+ // LocalFileWriter requires the file exists. So create an empty file here.
+ base::WriteFile(dest_path, "", 0);
base::MessageLoopForIO message_loop;
base::Thread file_thread("file_thread");
@@ -792,8 +797,8 @@
webkit_blob::FileStreamReader::CreateForLocalFile(
task_runner.get(), source_path, 0, base::Time()));
- scoped_ptr<FileStreamWriter> writer(FileStreamWriter::CreateForLocalFile(
- task_runner.get(), dest_path, 0, FileStreamWriter::CREATE_NEW_FILE));
+ scoped_ptr<FileStreamWriter> writer(
+ FileStreamWriter::CreateForLocalFile(task_runner.get(), dest_path, 0));
std::vector<int64> progress;
CopyOrMoveOperationDelegate::StreamCopyHelper helper(
@@ -825,10 +830,13 @@
base::ScopedTempDir temp_dir;
ASSERT_TRUE(temp_dir.CreateUniqueTempDir());
base::FilePath source_path = temp_dir.path().AppendASCII("source");
- base::FilePath dest_path = temp_dir.path().AppendASCII("dest");
const char kTestData[] = "abcdefghijklmnopqrstuvwxyz0123456789";
base::WriteFile(source_path, kTestData,
arraysize(kTestData) - 1); // Exclude trailing '\0'.
+
+ base::FilePath dest_path = temp_dir.path().AppendASCII("dest");
+ // LocalFileWriter requires the file exists. So create an empty file here.
+ base::WriteFile(dest_path, "", 0);
base::MessageLoopForIO message_loop;
base::Thread file_thread("file_thread");
@@ -843,8 +851,8 @@
webkit_blob::FileStreamReader::CreateForLocalFile(
task_runner.get(), source_path, 0, base::Time()));
- scoped_ptr<FileStreamWriter> writer(FileStreamWriter::CreateForLocalFile(
- task_runner.get(), dest_path, 0, FileStreamWriter::CREATE_NEW_FILE));
+ scoped_ptr<FileStreamWriter> writer(
+ FileStreamWriter::CreateForLocalFile(task_runner.get(), dest_path, 0));
std::vector<int64> progress;
CopyOrMoveOperationDelegate::StreamCopyHelper helper(
« no previous file with comments | « chrome/browser/media_galleries/fileapi/media_file_system_backend.cc ('k') | webkit/browser/fileapi/file_stream_writer.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698