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

chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc

Index: chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc
diff --git a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc
index e4398a66f3fbb77456b74817bf4af1422396d783..c630a41b203aa6907cf3639ff555f6ba2d322a2b 100644
--- a/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc
+++ b/chrome/browser/extensions/api/sync_file_system/sync_file_system_api.cc
@@ -22,11 +22,11 @@
 #include "content/public/browser/render_view_host.h"
 #include "content/public/browser/storage_partition.h"
 #include "content/public/common/content_client.h"
-#include "webkit/browser/fileapi/file_system_context.h"
-#include "webkit/browser/fileapi/file_system_url.h"
-#include "webkit/browser/quota/quota_manager.h"
-#include "webkit/common/fileapi/file_system_types.h"
-#include "webkit/common/fileapi/file_system_util.h"
+#include "storage/browser/fileapi/file_system_context.h"
+#include "storage/browser/fileapi/file_system_url.h"
+#include "storage/browser/quota/quota_manager.h"
+#include "storage/common/fileapi/file_system_types.h"
+#include "storage/common/fileapi/file_system_util.h"
 
 using content::BrowserContext;
 using content::BrowserThread;
@@ -69,17 +69,17 @@ bool SyncFileSystemDeleteFileSystemFunction::RunAsync() {
   std::string url;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &url));
 
-  scoped_refptr<fileapi::FileSystemContext> file_system_context =
+  scoped_refptr<storage::FileSystemContext> file_system_context =
       BrowserContext::GetStoragePartition(GetProfile(),
                                           render_view_host()->GetSiteInstance())
           ->GetFileSystemContext();
-  fileapi::FileSystemURL file_system_url(
+  storage::FileSystemURL file_system_url(
       file_system_context->CrackURL(GURL(url)));
 
   BrowserThread::PostTask(
       BrowserThread::IO,
       FROM_HERE,
-      Bind(&fileapi::FileSystemContext::DeleteFileSystem,
+      Bind(&storage::FileSystemContext::DeleteFileSystem,
            file_system_context,
            source_url().GetOrigin(),
            file_system_url.type(),
@@ -121,18 +121,18 @@ bool SyncFileSystemRequestFileSystemFunction::RunAsync() {
 
   // Initializes sync context for this extension and continue to open
   // a new file system.
-  BrowserThread::PostTask(
-      BrowserThread::IO, FROM_HERE,
-      Bind(&fileapi::FileSystemContext::OpenFileSystem,
-           GetFileSystemContext(),
-           source_url().GetOrigin(),
-           fileapi::kFileSystemTypeSyncable,
-           fileapi::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT,
-           base::Bind(&self::DidOpenFileSystem, this)));
+  BrowserThread::PostTask(BrowserThread::IO,
+                          FROM_HERE,
+                          Bind(&storage::FileSystemContext::OpenFileSystem,
+                               GetFileSystemContext(),
+                               source_url().GetOrigin(),
+                               storage::kFileSystemTypeSyncable,
+                               storage::OPEN_FILE_SYSTEM_CREATE_IF_NONEXISTENT,
+                               base::Bind(&self::DidOpenFileSystem, this)));
   return true;
 }
 
-fileapi::FileSystemContext*
+storage::FileSystemContext*
 SyncFileSystemRequestFileSystemFunction::GetFileSystemContext() {
   DCHECK(render_view_host());
   return BrowserContext::GetStoragePartition(
@@ -172,11 +172,11 @@ bool SyncFileSystemGetFileStatusFunction::RunAsync() {
   std::string url;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &url));
 
-  scoped_refptr<fileapi::FileSystemContext> file_system_context =
+  scoped_refptr<storage::FileSystemContext> file_system_context =
       BrowserContext::GetStoragePartition(GetProfile(),
                                           render_view_host()->GetSiteInstance())
           ->GetFileSystemContext();
-  fileapi::FileSystemURL file_system_url(
+  storage::FileSystemURL file_system_url(
       file_system_context->CrackURL(GURL(url)));
 
   GetSyncFileSystemService(GetProfile())->GetFileSyncStatus(
@@ -212,7 +212,7 @@ bool SyncFileSystemGetFileStatusesFunction::RunAsync() {
   base::ListValue* file_entry_urls = NULL;
   EXTENSION_FUNCTION_VALIDATE(args_->GetList(0, &file_entry_urls));
 
-  scoped_refptr<fileapi::FileSystemContext> file_system_context =
+  scoped_refptr<storage::FileSystemContext> file_system_context =
       BrowserContext::GetStoragePartition(GetProfile(),
                                           render_view_host()->GetSiteInstance())
           ->GetFileSystemContext();
@@ -227,7 +227,7 @@ bool SyncFileSystemGetFileStatusesFunction::RunAsync() {
   for (unsigned int i = 0; i < num_expected_results_; i++) {
     std::string url;
     file_entry_urls->GetString(i, &url);
-    fileapi::FileSystemURL file_system_url(
+    storage::FileSystemURL file_system_url(
         file_system_context->CrackURL(GURL(url)));
 
     sync_file_system_service->GetFileSyncStatus(
@@ -240,7 +240,7 @@ bool SyncFileSystemGetFileStatusesFunction::RunAsync() {
 }
 
 void SyncFileSystemGetFileStatusesFunction::DidGetFileStatus(
-    const fileapi::FileSystemURL& file_system_url,
+    const storage::FileSystemURL& file_system_url,
     SyncStatusCode sync_status_code,
     SyncFileStatus sync_file_status) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
@@ -266,7 +266,7 @@ void SyncFileSystemGetFileStatusesFunction::DidGetFileStatus(
     base::DictionaryValue* dict = new base::DictionaryValue();
     status_array->Append(dict);
 
-    fileapi::FileSystemURL url = it->first;
+    storage::FileSystemURL url = it->first;
     SyncStatusCode file_error = it->second.first;
     api::sync_file_system::FileStatus file_status =
         SyncFileStatusToExtensionEnum(it->second.second);
@@ -288,11 +288,11 @@ bool SyncFileSystemGetUsageAndQuotaFunction::RunAsync() {
   std::string url;
   EXTENSION_FUNCTION_VALIDATE(args_->GetString(0, &url));
 
-  scoped_refptr<fileapi::FileSystemContext> file_system_context =
+  scoped_refptr<storage::FileSystemContext> file_system_context =
       BrowserContext::GetStoragePartition(GetProfile(),
                                           render_view_host()->GetSiteInstance())
           ->GetFileSystemContext();
-  fileapi::FileSystemURL file_system_url(
+  storage::FileSystemURL file_system_url(
       file_system_context->CrackURL(GURL(url)));
 
   scoped_refptr<quota::QuotaManager> quota_manager =
@@ -306,7 +306,7 @@ bool SyncFileSystemGetUsageAndQuotaFunction::RunAsync() {
       Bind(&quota::QuotaManager::GetUsageAndQuotaForWebApps,
            quota_manager,
            source_url().GetOrigin(),
-           fileapi::FileSystemTypeToQuotaStorageType(file_system_url.type()),
+           storage::FileSystemTypeToQuotaStorageType(file_system_url.type()),
            Bind(&SyncFileSystemGetUsageAndQuotaFunction::DidGetUsageAndQuota,
                 this)));