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

storage/browser/fileapi/file_system_usage_cache.cc

Index: storage/browser/fileapi/file_system_usage_cache.cc
diff --git a/webkit/browser/fileapi/file_system_usage_cache.cc b/storage/browser/fileapi/file_system_usage_cache.cc
similarity index 91%
rename from webkit/browser/fileapi/file_system_usage_cache.cc
rename to storage/browser/fileapi/file_system_usage_cache.cc
index 89c6db1665fd783c919beee9dddfb43864f17b93..f2d5192ce17a12642b6d8350ef39f249311044dc 100644
--- a/webkit/browser/fileapi/file_system_usage_cache.cc
+++ b/storage/browser/fileapi/file_system_usage_cache.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_system_usage_cache.h"
+#include "storage/browser/fileapi/file_system_usage_cache.h"
 
 #include <utility>
 
@@ -12,9 +12,9 @@
 #include "base/files/file_path.h"
 #include "base/pickle.h"
 #include "base/stl_util.h"
-#include "webkit/browser/fileapi/timed_task_helper.h"
+#include "storage/browser/fileapi/timed_task_helper.h"
 
-namespace fileapi {
+namespace storage {
 
 namespace {
 const int64 kCloseDelaySeconds = 5;
@@ -23,8 +23,7 @@ const size_t kMaxHandleCacheSize = 2;
 
 FileSystemUsageCache::FileSystemUsageCache(
     base::SequencedTaskRunner* task_runner)
-    : task_runner_(task_runner),
-      weak_factory_(this) {
+    : task_runner_(task_runner), weak_factory_(this) {
 }
 
 FileSystemUsageCache::~FileSystemUsageCache() {
@@ -39,8 +38,7 @@ const int FileSystemUsageCache::kUsageFileHeaderSize = 4;
 
 // Pickle::{Read,Write}Bool treat bool as int
 const int FileSystemUsageCache::kUsageFileSize =
-    sizeof(Pickle::Header) +
-    FileSystemUsageCache::kUsageFileHeaderSize +
+    sizeof(Pickle::Header) + FileSystemUsageCache::kUsageFileHeaderSize +
     sizeof(int) + sizeof(int32) + sizeof(int64);  // NOLINT
 
 bool FileSystemUsageCache::GetUsage(const base::FilePath& usage_file_path,
@@ -128,12 +126,14 @@ bool FileSystemUsageCache::IsValid(const base::FilePath& usage_file_path) {
 }
 
 bool FileSystemUsageCache::AtomicUpdateUsageByDelta(
-    const base::FilePath& usage_file_path, int64 delta) {
+    const base::FilePath& usage_file_path,
+    int64 delta) {
   TRACE_EVENT0("FileSystem", "UsageCache::AtomicUpdateUsageByDelta");
   DCHECK(CalledOnValidThread());
   bool is_valid = true;
   uint32 dirty = 0;
-  int64 usage = 0;;
+  int64 usage = 0;
+  ;
   if (!Read(usage_file_path, &is_valid, &dirty, &usage))
     return false;
   return Write(usage_file_path, is_valid, dirty, usage + delta);
@@ -167,16 +167,16 @@ void FileSystemUsageCache::CloseCacheFiles() {
 }
 
 bool FileSystemUsageCache::Read(const base::FilePath& usage_file_path,
-                                 bool* is_valid,
-                                 uint32* dirty_out,
-                                 int64* usage_out) {
+                                bool* is_valid,
+                                uint32* dirty_out,
+                                int64* usage_out) {
   TRACE_EVENT0("FileSystem", "UsageCache::Read");
   DCHECK(CalledOnValidThread());
   DCHECK(is_valid);
   DCHECK(dirty_out);
   DCHECK(usage_out);
   char buffer[kUsageFileSize];
-  const char *header;
+  const char* header;
   if (usage_file_path.empty() ||
       !ReadBytes(usage_file_path, buffer, kUsageFileSize))
     return false;
@@ -191,10 +191,8 @@ bool FileSystemUsageCache::Read(const base::FilePath& usage_file_path,
       !read_pickle.ReadInt64(&iter, &usage))
     return false;
 
-  if (header[0] != kUsageFileHeader[0] ||
-      header[1] != kUsageFileHeader[1] ||
-      header[2] != kUsageFileHeader[2] ||
-      header[3] != kUsageFileHeader[3])
+  if (header[0] != kUsageFileHeader[0] || header[1] != kUsageFileHeader[1] ||
+      header[2] != kUsageFileHeader[2] || header[3] != kUsageFileHeader[3])
     return false;
 
   *dirty_out = dirty;
@@ -237,8 +235,7 @@ base::File* FileSystemUsageCache::GetFile(const base::FilePath& file_path) {
 
   new_file = new base::File(file_path,
                             base::File::FLAG_OPEN_ALWAYS |
-                            base::File::FLAG_READ |
-                            base::File::FLAG_WRITE);
+                                base::File::FLAG_READ | base::File::FLAG_WRITE);
   if (!new_file->IsValid()) {
     cache_files_.erase(inserted.first);
     delete new_file;
@@ -304,4 +301,4 @@ bool FileSystemUsageCache::HasCacheFileHandle(const base::FilePath& file_path) {
   return ContainsKey(cache_files_, file_path);
 }
 
-}  // namespace fileapi
+}  // namespace storage