Collapse fileapi, webkit_blob, webkit_database, quota, and webkit_common namespaces into single sto…

webkit/browser/fileapi/file_system_operation_context.h

Index: webkit/browser/fileapi/file_system_operation_context.h
diff --git a/webkit/browser/fileapi/file_system_operation_context.h b/webkit/browser/fileapi/file_system_operation_context.h
index decdecbb5caf3821bc25862f30074fa910d44161..0428bb4d8ef42b8824e3fddbdd57c512e2596e2d 100644
--- a/webkit/browser/fileapi/file_system_operation_context.h
+++ b/webkit/browser/fileapi/file_system_operation_context.h
@@ -16,7 +16,7 @@ namespace base {
 class SequencedTaskRunner;
 }
 
-namespace fileapi {
+namespace storage {
 
 class FileSystemContext;
 
@@ -50,7 +50,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemOperationContext
 
   // Returns the current remaining quota.
   int64 allowed_bytes_growth() const { return allowed_bytes_growth_; }
-  quota::QuotaLimitType quota_limit_type() const { return quota_limit_type_; }
+  storage::QuotaLimitType quota_limit_type() const { return quota_limit_type_; }
   base::SequencedTaskRunner* task_runner() const { return task_runner_.get(); }
 
   ChangeObserverList* change_observers() { return &change_observers_; }
@@ -67,7 +67,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemOperationContext
     DCHECK(setter_thread_checker_.CalledOnValidThread());
     update_observers_ = list;
   }
-  void set_quota_limit_type(quota::QuotaLimitType limit_type) {
+  void set_quota_limit_type(storage::QuotaLimitType limit_type) {
     DCHECK(setter_thread_checker_.CalledOnValidThread());
     quota_limit_type_ = limit_type;
   }
@@ -80,7 +80,7 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemOperationContext
   int64 allowed_bytes_growth_;
 
   // The current quota limit type, used by ObfuscatedFileUtil.
-  quota::QuotaLimitType quota_limit_type_;
+  storage::QuotaLimitType quota_limit_type_;
 
   // Observers attached to this context.
   ChangeObserverList change_observers_;
@@ -92,6 +92,6 @@ class WEBKIT_STORAGE_BROWSER_EXPORT_PRIVATE FileSystemOperationContext
   DISALLOW_COPY_AND_ASSIGN(FileSystemOperationContext);
 };
 
-}  // namespace fileapi
+}  // namespace storage
 
 #endif  // WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_OPERATION_CONTEXT_H_