Revert of Add a parameter to FileStreamWriter::CreateForLocalFile to allow creating new (https://codereview.chromium.org/197233008/)

Reason for revert:
Best guess that this broke
SyncFileSystemApiTest.WriteFileThenGetUsage
on XP Tests(1).

http://build.chromium.org/p/chromium.win/builders/XP%20Tests%20%281%29/builds/30601/steps/browser_tests/logs/WriteFileThenGetUsage

If not, we can just re-revert or reland it after a few cycles.

Original issue's description:
> Add a parameter to FileStreamWriter::CreateForLocalFile to allow creating new files as well as writing to existing files.
> See https://codereview.chromium.org/18023022/ for context; this is needed by upcoming IDB Blob support.
> 
> Tzik, please do primary review for filesystem; Kinaba, please review as ChromeOS owner.
> 
> BUG=108012
> R=kinaba,tzik
> 
> Committed: https://src.chromium.org/viewvc/chrome?view=rev&revision=258120

TBR=kinaba@chromium.org,tzik@chromium.org,ericu@chromium.org
NOTREECHECKS=true
NOTRY=true
BUG=108012

Review URL: https://codereview.chromium.org/206073006

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@258256 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 11 insertions, 40 deletions

diff --git a/webkit/browser/fileapi/file_stream_writer.h b/webkit/browser/fileapi/file_stream_writer.h
index 3a30ab2..1ebdfb9 100644
--- a/webkit/browser/fileapi/file_stream_writer.h
+++ b/webkit/browser/fileapi/file_stream_writer.h
@@ -23,15 +23,12 @@ namespace fileapi {
 // A generic interface for writing to a file-like object.
 class FileStreamWriter {
  public:
-  enum OpenOrCreate { OPEN_EXISTING_FILE, CREATE_NEW_FILE };
-
   // Creates a writer for the existing file in the path |file_path| starting
   // from |initial_offset|. Uses |task_runner| for async file operations.
   WEBKIT_STORAGE_BROWSER_EXPORT static FileStreamWriter* CreateForLocalFile(
       base::TaskRunner* task_runner,
       const base::FilePath& file_path,
-      int64 initial_offset,
-      OpenOrCreate open_or_create);
+      int64 initial_offset);
 
   // Closes the file. If there's an in-flight operation, it is canceled (i.e.,
   // the callback function associated with the operation is not called).
diff --git a/webkit/browser/fileapi/isolated_file_system_backend.cc b/webkit/browser/fileapi/isolated_file_system_backend.cc
index 9894488..a8acffb 100644
--- a/webkit/browser/fileapi/isolated_file_system_backend.cc
+++ b/webkit/browser/fileapi/isolated_file_system_backend.cc
@@ -122,12 +122,8 @@ scoped_ptr<FileStreamWriter> IsolatedFileSystemBackend::CreateFileStreamWriter(
     const FileSystemURL& url,
     int64 offset,
     FileSystemContext* context) const {
-  return scoped_ptr<FileStreamWriter>(
-      FileStreamWriter::CreateForLocalFile(
-          context->default_file_task_runner(),
-          url.path(),
-          offset,
-          FileStreamWriter::OPEN_EXISTING_FILE));
+  return scoped_ptr<FileStreamWriter>(FileStreamWriter::CreateForLocalFile(
+      context->default_file_task_runner(), url.path(), offset));
 }
 
 FileSystemQuotaUtil* IsolatedFileSystemBackend::GetQuotaUtil() {
diff --git a/webkit/browser/fileapi/local_file_stream_writer.cc b/webkit/browser/fileapi/local_file_stream_writer.cc
index 45e358a..1796de5 100644
--- a/webkit/browser/fileapi/local_file_stream_writer.cc
+++ b/webkit/browser/fileapi/local_file_stream_writer.cc
@@ -17,19 +17,14 @@ namespace {
 const int kOpenFlagsForWrite = base::PLATFORM_FILE_OPEN |
                                base::PLATFORM_FILE_WRITE |
                                base::PLATFORM_FILE_ASYNC;
-const int kCreateFlagsForWrite = base::PLATFORM_FILE_CREATE |
-                                 base::PLATFORM_FILE_WRITE |
-                                 base::PLATFORM_FILE_ASYNC;
 
 }  // namespace
 
 FileStreamWriter* FileStreamWriter::CreateForLocalFile(
     base::TaskRunner* task_runner,
     const base::FilePath& file_path,
-    int64 initial_offset,
-    OpenOrCreate open_or_create) {
-  return new LocalFileStreamWriter(
-      task_runner, file_path, initial_offset, open_or_create);
+    int64 initial_offset) {
+  return new LocalFileStreamWriter(task_runner, file_path, initial_offset);
 }
 
 LocalFileStreamWriter::~LocalFileStreamWriter() {
@@ -86,10 +81,8 @@ int LocalFileStreamWriter::Flush(const net::CompletionCallback& callback) {
 
 LocalFileStreamWriter::LocalFileStreamWriter(base::TaskRunner* task_runner,
                                              const base::FilePath& file_path,
-                                             int64 initial_offset,
-                                             OpenOrCreate open_or_create)
+                                             int64 initial_offset)
     : file_path_(file_path),
-      open_or_create_(open_or_create),
       initial_offset_(initial_offset),
       task_runner_(task_runner),
       has_pending_operation_(false),
@@ -103,18 +96,8 @@ int LocalFileStreamWriter::InitiateOpen(
 
   stream_impl_.reset(new net::FileStream(NULL, task_runner_));
 
-  int open_flags = 0;
-  switch (open_or_create_) {
-  case OPEN_EXISTING_FILE:
-    open_flags = kOpenFlagsForWrite;
-    break;
-  case CREATE_NEW_FILE:
-    open_flags = kCreateFlagsForWrite;
-    break;
-  }
-
   return stream_impl_->Open(file_path_,
-                            open_flags,
+                            kOpenFlagsForWrite,
                             base::Bind(&LocalFileStreamWriter::DidOpen,
                                        weak_factory_.GetWeakPtr(),
                                        error_callback,
diff --git a/webkit/browser/fileapi/local_file_stream_writer.h b/webkit/browser/fileapi/local_file_stream_writer.h
index 65ca9ac..dce428a 100644
--- a/webkit/browser/fileapi/local_file_stream_writer.h
+++ b/webkit/browser/fileapi/local_file_stream_writer.h
@@ -41,8 +41,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT LocalFileStreamWriter
   friend class LocalFileStreamWriterTest;
   LocalFileStreamWriter(base::TaskRunner* task_runner,
                         const base::FilePath& file_path,
-                        int64 initial_offset,
-                        OpenOrCreate open_or_create);
+                        int64 initial_offset);
 
   // Opens |file_path_| and if it succeeds, proceeds to InitiateSeek().
   // If failed, the error code is returned by calling |error_callback|.
@@ -79,7 +78,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT LocalFileStreamWriter
 
   // Initialization parameters.
   const base::FilePath file_path_;
-  OpenOrCreate open_or_create_;
   const int64 initial_offset_;
   scoped_refptr<base::TaskRunner> task_runner_;
 
diff --git a/webkit/browser/fileapi/local_file_stream_writer_unittest.cc b/webkit/browser/fileapi/local_file_stream_writer_unittest.cc
index a414044..53c559a 100644
--- a/webkit/browser/fileapi/local_file_stream_writer_unittest.cc
+++ b/webkit/browser/fileapi/local_file_stream_writer_unittest.cc
@@ -80,8 +80,7 @@ class LocalFileStreamWriterTest : public testing::Test {
 
   LocalFileStreamWriter* CreateWriter(const base::FilePath& path,
                                       int64 offset) {
-    return new LocalFileStreamWriter(file_task_runner(), path, offset,
-        FileStreamWriter::OPEN_EXISTING_FILE);
+    return new LocalFileStreamWriter(file_task_runner(), path, offset);
   }
 
  private:
diff --git a/webkit/browser/fileapi/sandbox_file_stream_writer.cc b/webkit/browser/fileapi/sandbox_file_stream_writer.cc
index aecaccd..a4e5df1 100644
--- a/webkit/browser/fileapi/sandbox_file_stream_writer.cc
+++ b/webkit/browser/fileapi/sandbox_file_stream_writer.cc
@@ -138,10 +138,8 @@ void SandboxFileStreamWriter::DidCreateSnapshotFile(
   }
   DCHECK(!local_file_writer_.get());
   local_file_writer_.reset(FileStreamWriter::CreateForLocalFile(
-      file_system_context_->default_file_task_runner(),
-      platform_path,
-      initial_offset_,
-      FileStreamWriter::OPEN_EXISTING_FILE));
+      file_system_context_->default_file_task_runner(), platform_path,
+      initial_offset_));
 
   quota::QuotaManagerProxy* quota_manager_proxy =
       file_system_context_->quota_manager_proxy();