Move storage-related files from webkit/ to new top-level directory storage/

storage/browser/fileapi/file_writer_delegate.cc

Index: storage/browser/fileapi/file_writer_delegate.cc
diff --git a/webkit/browser/fileapi/file_writer_delegate.cc b/storage/browser/fileapi/file_writer_delegate.cc
similarity index 84%
rename from webkit/browser/fileapi/file_writer_delegate.cc
rename to storage/browser/fileapi/file_writer_delegate.cc
index 83112780cb9a02009c3d9a6421bc63a94e243383..f034ad78df4aba9b727d176dffbc9597fffe32eb 100644
--- a/webkit/browser/fileapi/file_writer_delegate.cc
+++ b/storage/browser/fileapi/file_writer_delegate.cc
@@ -2,7 +2,7 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#include "webkit/browser/fileapi/file_writer_delegate.h"
+#include "storage/browser/fileapi/file_writer_delegate.h"
 
 #include "base/bind.h"
 #include "base/callback.h"
@@ -12,11 +12,11 @@
 #include "base/sequenced_task_runner.h"
 #include "base/threading/thread_restrictions.h"
 #include "net/base/net_errors.h"
-#include "webkit/browser/fileapi/file_stream_writer.h"
-#include "webkit/browser/fileapi/file_system_context.h"
-#include "webkit/common/fileapi/file_system_util.h"
+#include "storage/browser/fileapi/file_stream_writer.h"
+#include "storage/browser/fileapi/file_system_context.h"
+#include "storage/common/fileapi/file_system_util.h"
 
-namespace fileapi {
+namespace storage {
 
 static const int kReadBufSize = 32768;
 
@@ -50,14 +50,13 @@ void FileWriterDelegate::Cancel() {
     request_->Cancel();
   }
 
-  const int status = file_stream_writer_->Cancel(
-      base::Bind(&FileWriterDelegate::OnWriteCancelled,
-                 weak_factory_.GetWeakPtr()));
+  const int status = file_stream_writer_->Cancel(base::Bind(
+      &FileWriterDelegate::OnWriteCancelled, weak_factory_.GetWeakPtr()));
   // Return true to finish immediately if we have no pending writes.
   // Otherwise we'll do the final cleanup in the Cancel callback.
   if (status != net::ERR_IO_PENDING) {
-    write_callback_.Run(base::File::FILE_ERROR_ABORT, 0,
-                        GetCompletionStatusOnError());
+    write_callback_.Run(
+        base::File::FILE_ERROR_ABORT, 0, GetCompletionStatusOnError());
   }
 }
 
@@ -114,7 +113,8 @@ void FileWriterDelegate::Read() {
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&FileWriterDelegate::OnDataReceived,
-                   weak_factory_.GetWeakPtr(), bytes_read_));
+                   weak_factory_.GetWeakPtr(),
+                   bytes_read_));
   } else if (!request_->status().is_io_pending()) {
     OnError(base::File::FILE_ERROR_FAILED);
   }
@@ -145,7 +145,8 @@ void FileWriterDelegate::Write() {
     base::MessageLoop::current()->PostTask(
         FROM_HERE,
         base::Bind(&FileWriterDelegate::OnDataWritten,
-                   weak_factory_.GetWeakPtr(), write_response));
+                   weak_factory_.GetWeakPtr(),
+                   write_response));
   } else if (net::ERR_IO_PENDING != write_response) {
     OnError(NetErrorToFileError(write_response));
   }
@@ -194,11 +195,11 @@ void FileWriterDelegate::OnProgress(int bytes_written, bool done) {
     bytes_written_backlog_ = 0;
 
     if (done) {
-      MaybeFlushForCompletion(base::File::FILE_OK, bytes_written,
-                              SUCCESS_COMPLETED);
+      MaybeFlushForCompletion(
+          base::File::FILE_OK, bytes_written, SUCCESS_COMPLETED);
     } else {
-      write_callback_.Run(base::File::FILE_OK, bytes_written,
-                          SUCCESS_IO_PENDING);
+      write_callback_.Run(
+          base::File::FILE_OK, bytes_written, SUCCESS_IO_PENDING);
     }
     return;
   }
@@ -206,8 +207,8 @@ void FileWriterDelegate::OnProgress(int bytes_written, bool done) {
 }
 
 void FileWriterDelegate::OnWriteCancelled(int status) {
-  write_callback_.Run(base::File::FILE_ERROR_ABORT, 0,
-                      GetCompletionStatusOnError());
+  write_callback_.Run(
+      base::File::FILE_ERROR_ABORT, 0, GetCompletionStatusOnError());
 }
 
 void FileWriterDelegate::MaybeFlushForCompletion(
@@ -220,9 +221,12 @@ void FileWriterDelegate::MaybeFlushForCompletion(
   }
   DCHECK_EQ(FLUSH_ON_COMPLETION, flush_policy_);
 
-  int flush_error = file_stream_writer_->Flush(
-      base::Bind(&FileWriterDelegate::OnFlushed, weak_factory_.GetWeakPtr(),
-                 error, bytes_written, progress_status));
+  int flush_error =
+      file_stream_writer_->Flush(base::Bind(&FileWriterDelegate::OnFlushed,
+                                            weak_factory_.GetWeakPtr(),
+                                            error,
+                                            bytes_written,
+                                            progress_status));
   if (flush_error != net::ERR_IO_PENDING)
     OnFlushed(error, bytes_written, progress_status, flush_error);
 }
@@ -240,4 +244,4 @@ void FileWriterDelegate::OnFlushed(base::File::Error error,
   write_callback_.Run(error, bytes_written, progress_status);
 }
 
-}  // namespace fileapi
+}  // namespace storage