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

content/public/test/sandbox_file_system_test_helper.cc

Index: content/public/test/sandbox_file_system_test_helper.cc
diff --git a/content/public/test/sandbox_file_system_test_helper.cc b/content/public/test/sandbox_file_system_test_helper.cc
index e0bb59fee5e8c740dbc3b403d24c5be7376aa4a2..6ee486b9e8e12480af0c6b5da3401c1bf4b82ce1 100644
--- a/content/public/test/sandbox_file_system_test_helper.cc
+++ b/content/public/test/sandbox_file_system_test_helper.cc
@@ -10,32 +10,32 @@
 #include "content/public/test/mock_special_storage_policy.h"
 #include "content/public/test/test_file_system_context.h"
 #include "url/gurl.h"
-#include "webkit/browser/fileapi/file_system_context.h"
-#include "webkit/browser/fileapi/file_system_file_util.h"
-#include "webkit/browser/fileapi/file_system_operation_context.h"
-#include "webkit/browser/fileapi/file_system_operation_runner.h"
-#include "webkit/browser/fileapi/file_system_url.h"
-#include "webkit/browser/fileapi/file_system_usage_cache.h"
-#include "webkit/browser/fileapi/sandbox_file_system_backend.h"
-#include "webkit/browser/quota/quota_manager_proxy.h"
-#include "webkit/common/fileapi/file_system_util.h"
-
-using fileapi::FileSystemContext;
-using fileapi::FileSystemOperationContext;
-using fileapi::FileSystemOperationRunner;
-using fileapi::FileSystemURL;
+#include "storage/browser/fileapi/file_system_context.h"
+#include "storage/browser/fileapi/file_system_file_util.h"
+#include "storage/browser/fileapi/file_system_operation_context.h"
+#include "storage/browser/fileapi/file_system_operation_runner.h"
+#include "storage/browser/fileapi/file_system_url.h"
+#include "storage/browser/fileapi/file_system_usage_cache.h"
+#include "storage/browser/fileapi/sandbox_file_system_backend.h"
+#include "storage/browser/quota/quota_manager_proxy.h"
+#include "storage/common/fileapi/file_system_util.h"
+
+using storage::FileSystemContext;
+using storage::FileSystemOperationContext;
+using storage::FileSystemOperationRunner;
+using storage::FileSystemURL;
 
 namespace content {
 
 SandboxFileSystemTestHelper::SandboxFileSystemTestHelper(
     const GURL& origin,
-    fileapi::FileSystemType type)
+    storage::FileSystemType type)
     : origin_(origin), type_(type), file_util_(NULL) {
 }
 
 SandboxFileSystemTestHelper::SandboxFileSystemTestHelper()
     : origin_(GURL("http://foo.com")),
-      type_(fileapi::kFileSystemTypeTemporary),
+      type_(storage::kFileSystemTypeTemporary),
       file_util_(NULL) {
 }
 
@@ -106,7 +106,7 @@ int64 SandboxFileSystemTestHelper::ComputeCurrentOriginUsage() {
   usage_cache()->CloseCacheFiles();
   int64 size = base::ComputeDirectorySize(GetOriginRootPath());
   if (base::PathExists(GetUsageCachePath()))
-    size -= fileapi::FileSystemUsageCache::kUsageFileSize;
+    size -= storage::FileSystemUsageCache::kUsageFileSize;
   return size;
 }
 
@@ -131,12 +131,12 @@ SandboxFileSystemTestHelper::NewOperationContext() {
 }
 
 void SandboxFileSystemTestHelper::AddFileChangeObserver(
-    fileapi::FileChangeObserver* observer) {
+    storage::FileChangeObserver* observer) {
   file_system_context_->sandbox_backend()->GetQuotaUtil()->
       AddFileChangeObserver(type_, observer, NULL);
 }
 
-fileapi::FileSystemUsageCache* SandboxFileSystemTestHelper::usage_cache() {
+storage::FileSystemUsageCache* SandboxFileSystemTestHelper::usage_cache() {
   return file_system_context()->sandbox_delegate()->usage_cache();
 }