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

webkit/browser/fileapi/async_file_util.h

 // Copyright (c) 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_ASYNC_FILE_UTIL_H_
 #define WEBKIT_BROWSER_FILEAPI_ASYNC_FILE_UTIL_H_
 
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/callback_forward.h"
 #include "base/files/file.h"
 #include "base/files/file_util_proxy.h"
 #include "base/memory/scoped_ptr.h"
 #include "webkit/browser/fileapi/file_system_operation.h"
 #include "webkit/browser/webkit_storage_browser_export.h"
 #include "webkit/common/fileapi/directory_entry.h"
 
 namespace base {
 class Time;
 }
 
-namespace webkit_blob {
+namespace storage {
 class ShareableFileReference;
 }
 
-namespace fileapi {
+namespace storage {
 
 class FileSystemOperationContext;
 class FileSystemURL;
 
 // An interface which provides filesystem-specific file operations for
 // FileSystemOperationImpl.
 //
 // Each filesystem which needs to be dispatched from FileSystemOperationImpl
 // must implement this interface or a synchronous version of interface:
 // FileSystemFileUtil.
@@ skipping 29 matching lines @@
   typedef std::vector<DirectoryEntry> EntryList;
   typedef base::Callback<
       void(base::File::Error result,
            const EntryList& file_list,
            bool has_more)> ReadDirectoryCallback;
 
   typedef base::Callback<
       void(base::File::Error result,
            const base::File::Info& file_info,
            const base::FilePath& platform_path,
-           const scoped_refptr<webkit_blob::ShareableFileReference>& file_ref)>
+           const scoped_refptr<storage::ShareableFileReference>& file_ref)>
       CreateSnapshotFileCallback;
 
-
   typedef base::Callback<void(int64 size)> CopyFileProgressCallback;
 
   typedef FileSystemOperation::CopyOrMoveOption CopyOrMoveOption;
 
   // Creates an AsyncFileUtil instance which performs file operations on
   // local native file system. The created instance assumes
   // FileSystemURL::path() has the target platform path.
   WEBKIT_STORAGE_BROWSER_EXPORT static AsyncFileUtil*
       CreateForLocalFileSystem();
 
@@ skipping 264 matching lines @@
   // check the return code.
   virtual void CreateSnapshotFile(
       scoped_ptr<FileSystemOperationContext> context,
       const FileSystemURL& url,
       const CreateSnapshotFileCallback& callback) = 0;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AsyncFileUtil);
 };
 
-}  // namespace fileapi
+}  // namespace storage
 
 #endif  // WEBKIT_BROWSER_FILEAPI_ASYNC_FILE_UTIL_H_