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

webkit/common/fileapi/file_system_util.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.
 
 #ifndef WEBKIT_COMMON_FILEAPI_FILE_SYSTEM_UTIL_H_
 #define WEBKIT_COMMON_FILEAPI_FILE_SYSTEM_UTIL_H_
 
 #include <string>
 #include <vector>
 
 #include "base/files/file.h"
 #include "base/files/file_path.h"
 #include "third_party/WebKit/public/platform/WebFileError.h"
 #include "third_party/WebKit/public/platform/WebFileSystemType.h"
 #include "webkit/common/fileapi/file_system_info.h"
 #include "webkit/common/fileapi/file_system_types.h"
 #include "webkit/common/quota/quota_types.h"
 #include "webkit/common/webkit_storage_common_export.h"
 
 class GURL;
 
-namespace fileapi {
+namespace storage {
 
 WEBKIT_STORAGE_COMMON_EXPORT extern const char kPersistentDir[];
 WEBKIT_STORAGE_COMMON_EXPORT extern const char kTemporaryDir[];
 WEBKIT_STORAGE_COMMON_EXPORT extern const char kExternalDir[];
 WEBKIT_STORAGE_COMMON_EXPORT extern const char kIsolatedDir[];
 WEBKIT_STORAGE_COMMON_EXPORT extern const char kTestDir[];
 
 class WEBKIT_STORAGE_COMMON_EXPORT VirtualPath {
  public:
   static const base::FilePath::CharType kRoot[];
@@ skipping 66 matching lines @@
 //   The name for a TEMPORARY filesystem of "http://www.example.com:80/"
 //   should look like: "http_www.example.host_80:temporary"
 WEBKIT_STORAGE_COMMON_EXPORT std::string
 GetFileSystemName(const GURL& origin_url, FileSystemType type);
 
 // Converts FileSystemType |type| to/from the StorageType |storage_type| that
 // is used for the unified quota system.
 // (Basically this naively maps TEMPORARY storage type to TEMPORARY filesystem
 // type, PERSISTENT storage type to PERSISTENT filesystem type and vice versa.)
 WEBKIT_STORAGE_COMMON_EXPORT FileSystemType
-QuotaStorageTypeToFileSystemType(quota::StorageType storage_type);
+    QuotaStorageTypeToFileSystemType(storage::StorageType storage_type);
 
-WEBKIT_STORAGE_COMMON_EXPORT quota::StorageType
-FileSystemTypeToQuotaStorageType(FileSystemType type);
+WEBKIT_STORAGE_COMMON_EXPORT storage::StorageType
+    FileSystemTypeToQuotaStorageType(FileSystemType type);
 
 // Returns the string representation of the given filesystem |type|.
 // Returns an empty string if the |type| is invalid.
 WEBKIT_STORAGE_COMMON_EXPORT std::string
 GetFileSystemTypeString(FileSystemType type);
 
 // Sets type to FileSystemType enum that corresponds to the string name.
 // Returns false if the |type_string| is invalid.
 WEBKIT_STORAGE_COMMON_EXPORT bool GetFileSystemPublicType(
     std::string type_string,
@@ skipping 47 matching lines @@
 // Returns the root URI for an external filesystem for origin |origin_url|
 // and |mount_name|.
 WEBKIT_STORAGE_COMMON_EXPORT std::string GetExternalFileSystemRootURIString(
     const GURL& origin_url,
     const std::string& mount_name);
 
 // Translates the net::Error to base::File::Error.
 WEBKIT_STORAGE_COMMON_EXPORT base::File::Error
 NetErrorToFileError(int error);
 
-}  // namespace fileapi
+}  // namespace storage
 
 #endif  // WEBKIT_COMMON_FILEAPI_FILE_SYSTEM_UTIL_H_