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

chrome/browser/browsing_data/browsing_data_file_system_helper.cc

Index: chrome/browser/browsing_data/browsing_data_file_system_helper.cc
diff --git a/chrome/browser/browsing_data/browsing_data_file_system_helper.cc b/chrome/browser/browsing_data/browsing_data_file_system_helper.cc
index 14ccbbcff81dee97814f104550857c698c7b4eb4..bbd67f6ec9eb65d89f42467630a438cfb0e32c9d 100644
--- a/chrome/browser/browsing_data/browsing_data_file_system_helper.cc
+++ b/chrome/browser/browsing_data/browsing_data_file_system_helper.cc
@@ -14,13 +14,13 @@
 #include "base/strings/utf_string_conversions.h"
 #include "chrome/browser/browsing_data/browsing_data_helper.h"
 #include "content/public/browser/browser_thread.h"
-#include "webkit/browser/fileapi/file_system_context.h"
-#include "webkit/browser/fileapi/file_system_quota_util.h"
-#include "webkit/common/fileapi/file_system_types.h"
+#include "storage/browser/fileapi/file_system_context.h"
+#include "storage/browser/fileapi/file_system_quota_util.h"
+#include "storage/common/fileapi/file_system_types.h"
 
 using content::BrowserThread;
 
-namespace fileapi {
+namespace storage {
 class FileSystemContext;
 }
 
@@ -33,7 +33,7 @@ class BrowsingDataFileSystemHelperImpl : public BrowsingDataFileSystemHelper {
  public:
   // BrowsingDataFileSystemHelper implementation
   explicit BrowsingDataFileSystemHelperImpl(
-      fileapi::FileSystemContext* filesystem_context);
+      storage::FileSystemContext* filesystem_context);
   virtual void StartFetching(const base::Callback<
       void(const std::list<FileSystemInfo>&)>& callback) OVERRIDE;
   virtual void DeleteFileSystemOrigin(const GURL& origin) OVERRIDE;
@@ -61,7 +61,7 @@ class BrowsingDataFileSystemHelperImpl : public BrowsingDataFileSystemHelper {
 
   // Keep a reference to the FileSystemContext object for the current profile
   // for use on the file task runner.
-  scoped_refptr<fileapi::FileSystemContext> filesystem_context_;
+  scoped_refptr<storage::FileSystemContext> filesystem_context_;
 
   // Holds the current list of file systems returned to the client after
   // StartFetching is called. Access to |file_system_info_| is triggered
@@ -86,9 +86,8 @@ class BrowsingDataFileSystemHelperImpl : public BrowsingDataFileSystemHelper {
 };
 
 BrowsingDataFileSystemHelperImpl::BrowsingDataFileSystemHelperImpl(
-    fileapi::FileSystemContext* filesystem_context)
-    : filesystem_context_(filesystem_context),
-      is_fetching_(false) {
+    storage::FileSystemContext* filesystem_context)
+    : filesystem_context_(filesystem_context), is_fetching_(false) {
   DCHECK(filesystem_context_.get());
 }
 
@@ -123,20 +122,20 @@ void BrowsingDataFileSystemHelperImpl::FetchFileSystemInfoInFileThread() {
   DCHECK(file_task_runner()->RunsTasksOnCurrentThread());
 
   // We check usage for these filesystem types.
-  const fileapi::FileSystemType types[] = {
-    fileapi::kFileSystemTypeTemporary,
-    fileapi::kFileSystemTypePersistent,
+  const storage::FileSystemType types[] = {
+    storage::kFileSystemTypeTemporary,
+    storage::kFileSystemTypePersistent,
 #if defined(ENABLE_EXTENSIONS)
-    fileapi::kFileSystemTypeSyncable,
+    storage::kFileSystemTypeSyncable,
 #endif
   };
 
   typedef std::map<GURL, FileSystemInfo> OriginInfoMap;
   OriginInfoMap file_system_info_map;
   for (size_t i = 0; i < arraysize(types); ++i) {
-    fileapi::FileSystemType type = types[i];
-    fileapi::FileSystemQuotaUtil* quota_util =
-      filesystem_context_->GetQuotaUtil(type);
+    storage::FileSystemType type = types[i];
+    storage::FileSystemQuotaUtil* quota_util =
+        filesystem_context_->GetQuotaUtil(type);
     DCHECK(quota_util);
     std::set<GURL> origins;
     quota_util->GetOriginsForTypeOnFileTaskRunner(type, &origins);
@@ -187,7 +186,7 @@ BrowsingDataFileSystemHelper::FileSystemInfo::~FileSystemInfo() {}
 
 // static
 BrowsingDataFileSystemHelper* BrowsingDataFileSystemHelper::Create(
-    fileapi::FileSystemContext* filesystem_context) {
+    storage::FileSystemContext* filesystem_context) {
   return new BrowsingDataFileSystemHelperImpl(filesystem_context);
 }
 
@@ -212,7 +211,9 @@ CannedBrowsingDataFileSystemHelper*
 }
 
 void CannedBrowsingDataFileSystemHelper::AddFileSystem(
-    const GURL& origin, const fileapi::FileSystemType type, const int64 size) {
+    const GURL& origin,
+    const storage::FileSystemType type,
+    const int64 size) {
   DCHECK_CURRENTLY_ON(BrowserThread::UI);
   // This canned implementation of AddFileSystem uses an O(n^2) algorithm; which
   // is fine, as it isn't meant for use in a high-volume context. If it turns