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

webkit/browser/fileapi/file_system_operation_impl.h

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_OPERATION_IMPL_H_
 #define WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_OPERATION_IMPL_H_
 
 #include <vector>
 
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/memory/weak_ptr.h"
 #include "webkit/browser/fileapi/file_system_operation.h"
 #include "webkit/browser/fileapi/file_system_operation_context.h"
 #include "webkit/browser/fileapi/file_system_url.h"
 #include "webkit/browser/fileapi/file_writer_delegate.h"
 #include "webkit/browser/webkit_storage_browser_export.h"
 #include "webkit/common/blob/scoped_file.h"
 #include "webkit/common/quota/quota_types.h"
 
-namespace fileapi {
+namespace storage {
 
 class AsyncFileUtil;
 class FileSystemContext;
 class RecursiveOperationDelegate;
 
 // The default implementation of FileSystemOperation for file systems.
 class WEBKIT_STORAGE_BROWSER_EXPORT FileSystemOperationImpl
     : public NON_EXPORTED_BASE(FileSystemOperation) {
  public:
   virtual ~FileSystemOperationImpl();
@@ skipping 79 matching lines @@
   void GetUsageAndQuotaThenRunTask(
       const FileSystemURL& url,
       const base::Closure& task,
       const base::Closure& error_callback);
 
   // Called after the quota info is obtained from the quota manager
   // (which is triggered by GetUsageAndQuotaThenRunTask).
   // Sets the quota info in the operation_context_ and then runs the given
   // |task| if the returned quota status is successful, otherwise runs
   // |error_callback|.
-  void DidGetUsageAndQuotaAndRunTask(
-      const base::Closure& task,
-      const base::Closure& error_callback,
-      quota::QuotaStatusCode status,
-      int64 usage, int64 quota);
+  void DidGetUsageAndQuotaAndRunTask(const base::Closure& task,
+                                     const base::Closure& error_callback,
+                                     storage::QuotaStatusCode status,
+                                     int64 usage,
+                                     int64 quota);
 
   // The 'body' methods that perform the actual work (i.e. posting the
   // file task on proxy_) after the quota check.
   void DoCreateFile(const FileSystemURL& url,
                     const StatusCallback& callback, bool exclusive);
   void DoCreateDirectory(const FileSystemURL& url,
                          const StatusCallback& callback,
                          bool exclusive,
                          bool recursive);
   void DoCopyFileLocal(const FileSystemURL& src,
@@ skipping 58 matching lines @@
   StatusCallback cancel_callback_;
 
   // A flag to make sure we call operation only once per instance.
   OperationType pending_operation_;
 
   base::WeakPtrFactory<FileSystemOperationImpl> weak_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(FileSystemOperationImpl);
 };
 
-}  // namespace fileapi
+}  // namespace storage
 
 #endif  // WEBKIT_BROWSER_FILEAPI_FILE_SYSTEM_OPERATION_IMPL_H_