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

content/common/fileapi/file_system_messages.h

 // Copyright (c) 2012 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.
 
 // IPC messages for the file system.
 // Multiply-included message file, hence no include guard.
 
 #include "ipc/ipc_message_macros.h"
 #include "ipc/ipc_platform_file.h"
 #include "url/gurl.h"
 #include "webkit/common/fileapi/directory_entry.h"
 #include "webkit/common/fileapi/file_system_info.h"
 #include "webkit/common/fileapi/file_system_types.h"
 #include "webkit/common/quota/quota_types.h"
 
 #undef IPC_MESSAGE_EXPORT
 #define IPC_MESSAGE_EXPORT CONTENT_EXPORT
 #define IPC_MESSAGE_START FileSystemMsgStart
 
-IPC_STRUCT_TRAITS_BEGIN(fileapi::DirectoryEntry)
+IPC_STRUCT_TRAITS_BEGIN(storage::DirectoryEntry)
   IPC_STRUCT_TRAITS_MEMBER(name)
   IPC_STRUCT_TRAITS_MEMBER(is_directory)
 IPC_STRUCT_TRAITS_END()
 
-IPC_STRUCT_TRAITS_BEGIN(fileapi::FileSystemInfo)
+IPC_STRUCT_TRAITS_BEGIN(storage::FileSystemInfo)
   IPC_STRUCT_TRAITS_MEMBER(name)
   IPC_STRUCT_TRAITS_MEMBER(root_url)
   IPC_STRUCT_TRAITS_MEMBER(mount_type)
 IPC_STRUCT_TRAITS_END()
 
-IPC_ENUM_TRAITS(fileapi::FileSystemType)
-IPC_ENUM_TRAITS(quota::QuotaLimitType)
+IPC_ENUM_TRAITS(storage::FileSystemType)
+IPC_ENUM_TRAITS(storage::QuotaLimitType)
 
 // File system messages sent from the browser to the child process.
 
 // WebFrameClient::openFileSystem response messages.
 IPC_MESSAGE_CONTROL3(FileSystemMsg_DidOpenFileSystem,
                      int /* request_id */,
                      std::string /* name */,
                      GURL /* root_url */)
 
 // WebFileSystem response messages.
 IPC_MESSAGE_CONTROL4(FileSystemMsg_DidResolveURL,
                      int /* request_id */,
-                     fileapi::FileSystemInfo /* filesystem_info */,
+                     storage::FileSystemInfo /* filesystem_info */,
                      base::FilePath /* file_path */,
                      bool /* is_directory */)
 IPC_MESSAGE_CONTROL1(FileSystemMsg_DidSucceed,
                      int /* request_id */)
 IPC_MESSAGE_CONTROL2(FileSystemMsg_DidReadMetadata,
                      int /* request_id */,
                      base::File::Info)
 IPC_MESSAGE_CONTROL3(FileSystemMsg_DidCreateSnapshotFile,
                      int /* request_id */,
                      base::File::Info,
                      base::FilePath /* true platform path */)
 IPC_MESSAGE_CONTROL3(FileSystemMsg_DidReadDirectory,
                      int /* request_id */,
-                     std::vector<fileapi::DirectoryEntry> /* entries */,
+                     std::vector<storage::DirectoryEntry> /* entries */,
                      bool /* has_more */)
 IPC_MESSAGE_CONTROL3(FileSystemMsg_DidWrite,
                      int /* request_id */,
                      int64 /* byte count */,
                      bool /* complete */)
 IPC_MESSAGE_CONTROL2(FileSystemMsg_DidFail,
                      int /* request_id */,
                      base::File::Error /* error_code */)
 
 // File system messages sent from the child process to the browser.
 
 // WebFrameClient::openFileSystem() message.
 IPC_MESSAGE_CONTROL3(FileSystemHostMsg_OpenFileSystem,
                      int /* request_id */,
                      GURL /* origin_url */,
-                     fileapi::FileSystemType /* type */)
+                     storage::FileSystemType /* type */)
 
 // WevFrameClient::resolveURL() message.
 IPC_MESSAGE_CONTROL2(FileSystemHostMsg_ResolveURL,
                      int /* request_id */,
                      GURL /* filesystem_url */)
 
 // WebFrameClient::deleteFileSystem() message.
 IPC_MESSAGE_CONTROL3(FileSystemHostMsg_DeleteFileSystem,
                      int /* request_id */,
                      GURL /* origin_url */,
-                     fileapi::FileSystemType /* type */)
+                     storage::FileSystemType /* type */)
 
 // WebFileSystem::move() message.
 IPC_MESSAGE_CONTROL3(FileSystemHostMsg_Move,
                      int /* request_id */,
                      GURL /* src path */,
                      GURL /* dest path */)
 
 // WebFileSystem::copy() message.
 IPC_MESSAGE_CONTROL3(FileSystemHostMsg_Copy,
                      int /* request_id */,
@@ skipping 63 matching lines @@
 // Renderers are expected to send this message after having processed
 // the FileSystemMsg_DidCreateSnapshotFile message. In particular,
 // after having created a BlobDataHandle backed by the snapshot file.
 IPC_MESSAGE_CONTROL1(FileSystemHostMsg_DidReceiveSnapshotFile,
                      int /* request_id */)
 
 // For Pepper's URL loader.
 IPC_SYNC_MESSAGE_CONTROL1_1(FileSystemHostMsg_SyncGetPlatformPath,
                             GURL /* file path */,
                             base::FilePath /* platform_path */)