Revert of Revert of Add a parameter to FileStreamWriter::CreateForLocalFile to allow creating new

content/browser/fileapi/copy_or_move_operation_delegate_unittest.cc

 // Copyright 2013 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 <map>
 #include <queue>
 
 #include "base/basictypes.h"
 #include "base/bind.h"
 #include "base/file_util.h"
@@ skipping 700 matching lines @@
         }
       }
     }
   }
 }
 
 TEST(LocalFileSystemCopyOrMoveOperationTest, StreamCopyHelper) {
   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");
   ASSERT_TRUE(file_thread.Start());
   ScopedThreadStopper thread_stopper(&file_thread);
   ASSERT_TRUE(thread_stopper.is_valid());
 
   scoped_refptr<base::MessageLoopProxy> task_runner =
       file_thread.message_loop_proxy();
 
   scoped_ptr<webkit_blob::FileStreamReader> reader(
       webkit_blob::FileStreamReader::CreateForLocalFile(
           task_runner.get(), source_path, 0, base::Time()));
 
-  scoped_ptr<FileStreamWriter> writer(
-      FileStreamWriter::CreateForLocalFile(task_runner.get(), dest_path, 0));
+  scoped_ptr<FileStreamWriter> writer(FileStreamWriter::CreateForLocalFile(
+      task_runner.get(), dest_path, 0, FileStreamWriter::CREATE_NEW_FILE));
 
   std::vector<int64> progress;
   CopyOrMoveOperationDelegate::StreamCopyHelper helper(
       reader.Pass(), writer.Pass(),
       false,  // don't need flush
       10,  // buffer size
       base::Bind(&RecordFileProgressCallback, base::Unretained(&progress)),
       base::TimeDelta());  // For testing, we need all the progress.
 
   base::File::Error error = base::File::FILE_ERROR_FAILED;
@@ skipping 15 matching lines @@
 }
 
 TEST(LocalFileSystemCopyOrMoveOperationTest, StreamCopyHelperWithFlush) {
   // Testing the same configuration as StreamCopyHelper, but with |need_flush|
   // parameter set to true. Since it is hard to test that the flush is indeed
   // taking place, this test just only verifies that the file is correctly
   // written with or without the flag.
   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");
   ASSERT_TRUE(file_thread.Start());
   ScopedThreadStopper thread_stopper(&file_thread);
   ASSERT_TRUE(thread_stopper.is_valid());
 
   scoped_refptr<base::MessageLoopProxy> task_runner =
       file_thread.message_loop_proxy();
 
   scoped_ptr<webkit_blob::FileStreamReader> reader(
       webkit_blob::FileStreamReader::CreateForLocalFile(
           task_runner.get(), source_path, 0, base::Time()));
 
-  scoped_ptr<FileStreamWriter> writer(
-      FileStreamWriter::CreateForLocalFile(task_runner.get(), dest_path, 0));
+  scoped_ptr<FileStreamWriter> writer(FileStreamWriter::CreateForLocalFile(
+      task_runner.get(), dest_path, 0, FileStreamWriter::CREATE_NEW_FILE));
 
   std::vector<int64> progress;
   CopyOrMoveOperationDelegate::StreamCopyHelper helper(
       reader.Pass(), writer.Pass(),
       true,  // need flush
       10,  // buffer size
       base::Bind(&RecordFileProgressCallback, base::Unretained(&progress)),
       base::TimeDelta());  // For testing, we need all the progress.
 
   base::File::Error error = base::File::FILE_ERROR_FAILED;
@@ skipping 11 matching lines @@
 
   std::string content;
   ASSERT_TRUE(base::ReadFileToString(dest_path, &content));
   EXPECT_EQ(kTestData, content);
 }
 
 TEST(LocalFileSystemCopyOrMoveOperationTest, StreamCopyHelper_Cancel) {
   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");
   ASSERT_TRUE(file_thread.Start());
   ScopedThreadStopper thread_stopper(&file_thread);
   ASSERT_TRUE(thread_stopper.is_valid());
 
   scoped_refptr<base::MessageLoopProxy> task_runner =
       file_thread.message_loop_proxy();
 
   scoped_ptr<webkit_blob::FileStreamReader> reader(
       webkit_blob::FileStreamReader::CreateForLocalFile(
           task_runner.get(), source_path, 0, base::Time()));
 
-  scoped_ptr<FileStreamWriter> writer(
-      FileStreamWriter::CreateForLocalFile(task_runner.get(), dest_path, 0));
+  scoped_ptr<FileStreamWriter> writer(FileStreamWriter::CreateForLocalFile(
+      task_runner.get(), dest_path, 0, FileStreamWriter::CREATE_NEW_FILE));
 
   std::vector<int64> progress;
   CopyOrMoveOperationDelegate::StreamCopyHelper helper(
       reader.Pass(), writer.Pass(),
       false,  // need_flush
       10,  // buffer size
       base::Bind(&RecordFileProgressCallback, base::Unretained(&progress)),
       base::TimeDelta());  // For testing, we need all the progress.
 
   // Call Cancel() later.
   base::MessageLoopProxy::current()->PostTask(
       FROM_HERE,
       base::Bind(&CopyOrMoveOperationDelegate::StreamCopyHelper::Cancel,
                  base::Unretained(&helper)));
 
   base::File::Error error = base::File::FILE_ERROR_FAILED;
   base::RunLoop run_loop;
   helper.Run(base::Bind(&AssignAndQuit, &run_loop, &error));
   run_loop.Run();
 
   EXPECT_EQ(base::File::FILE_ERROR_ABORT, error);
 }
 
 }  // namespace content