webkit: Merge blob and fileapi into one build target 'storage'

webkit/fileapi/file_system_util.h

Index: webkit/fileapi/file_system_util.h
diff --git a/webkit/fileapi/file_system_util.h b/webkit/fileapi/file_system_util.h
index 0554a68bba41c5c37dd5bc8dcd6dd17ea11c9170..74091c49d994fb0b751fcf15eca116b6b8059143 100644
--- a/webkit/fileapi/file_system_util.h
+++ b/webkit/fileapi/file_system_util.h
@@ -12,8 +12,8 @@
 #include "base/platform_file.h"
 #include "third_party/WebKit/Source/WebKit/chromium/public/WebFileError.h"
 #include "webkit/fileapi/file_system_types.h"
-#include "webkit/fileapi/fileapi_export.h"
 #include "webkit/quota/quota_types.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 class GURL;
 
@@ -25,7 +25,7 @@ extern const char kExternalDir[];
 extern const char kIsolatedDir[];
 extern const char kTestDir[];
 
-class FILEAPI_EXPORT VirtualPath {
+class WEBKIT_STORAGE_EXPORT VirtualPath {
  public:
   // Use this instead of FilePath::BaseName when operating on virtual paths.
   // FilePath::BaseName will get confused by ':' on Windows when it looks like a
@@ -49,7 +49,7 @@ class FILEAPI_EXPORT VirtualPath {
 // returns URL without the filesystem ID.
 //
 // |type| needs to be public type as the returned URI is given to the renderer.
-FILEAPI_EXPORT GURL GetFileSystemRootURI(const GURL& origin_url,
+WEBKIT_STORAGE_EXPORT GURL GetFileSystemRootURI(const GURL& origin_url,
                                          FileSystemType type);
 
 // Returns the name for the filesystem that is specified by a pair of
@@ -63,16 +63,16 @@ FILEAPI_EXPORT GURL GetFileSystemRootURI(const GURL& origin_url,
 // Example:
 //   The name for a TEMPORARY filesystem of "http://www.example.com:80/"
 //   should look like: "http_www.example.host_80:temporary"
-FILEAPI_EXPORT std::string GetFileSystemName(const GURL& origin_url,
+WEBKIT_STORAGE_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.)
-FILEAPI_EXPORT FileSystemType QuotaStorageTypeToFileSystemType(
+WEBKIT_STORAGE_EXPORT FileSystemType QuotaStorageTypeToFileSystemType(
     quota::StorageType storage_type);
-FILEAPI_EXPORT quota::StorageType FileSystemTypeToQuotaStorageType(
+WEBKIT_STORAGE_EXPORT quota::StorageType FileSystemTypeToQuotaStorageType(
     FileSystemType type);
 
 // Returns the origin identifier string for the given |url| and vice versa.
@@ -83,13 +83,13 @@ FILEAPI_EXPORT quota::StorageType FileSystemTypeToQuotaStorageType(
 // Example:
 //   "http://www.example.com:80/"'s identifier should look like:
 //   "http_www.example.host_80"
-FILEAPI_EXPORT std::string GetOriginIdentifierFromURL(const GURL& url);
-FILEAPI_EXPORT GURL GetOriginURLFromIdentifier(
+WEBKIT_STORAGE_EXPORT std::string GetOriginIdentifierFromURL(const GURL& url);
+WEBKIT_STORAGE_EXPORT GURL GetOriginURLFromIdentifier(
     const std::string& origin_identifier);
 
 // Returns the string representation of the given filesystem |type|.
 // Returns an empty string if the |type| is invalid.
-FILEAPI_EXPORT std::string GetFileSystemTypeString(FileSystemType type);
+WEBKIT_STORAGE_EXPORT std::string GetFileSystemTypeString(FileSystemType type);
 
 // Encodes |file_path| to a string.
 // Following conditions should be held:
@@ -99,18 +99,19 @@ FILEAPI_EXPORT std::string GetFileSystemTypeString(FileSystemType type);
 //
 // TODO(tzik): Replace CreateFilePath and FilePathToString in
 // third_party/leveldatabase/env_chromium.cc with them.
-FILEAPI_EXPORT std::string FilePathToString(const FilePath& file_path);
+WEBKIT_STORAGE_EXPORT std::string FilePathToString(const FilePath& file_path);
 
 // Decode a file path from |file_path_string|.
-FILEAPI_EXPORT FilePath StringToFilePath(const std::string& file_path_string);
+WEBKIT_STORAGE_EXPORT FilePath StringToFilePath(
+    const std::string& file_path_string);
 
 // File error conversion
-FILEAPI_EXPORT WebKit::WebFileError PlatformFileErrorToWebFileError(
+WEBKIT_STORAGE_EXPORT WebKit::WebFileError PlatformFileErrorToWebFileError(
     base::PlatformFileError error_code);
 
 // Generate a file system name for the given arguments. Should only be used by
 // platform apps.
-FILEAPI_EXPORT std::string GetIsolatedFileSystemName(
+WEBKIT_STORAGE_EXPORT std::string GetIsolatedFileSystemName(
     const GURL& origin_url,
     const std::string& filesystem_id);
 
@@ -118,7 +119,7 @@ FILEAPI_EXPORT std::string GetIsolatedFileSystemName(
 // platform apps. This function will return false if the file system name is
 // not of the form {origin}:Isolated_{id}, and will also check that there is an
 // origin and id present. It will not check that the origin or id are valid.
-FILEAPI_EXPORT bool CrackIsolatedFileSystemName(
+WEBKIT_STORAGE_EXPORT bool CrackIsolatedFileSystemName(
     const std::string& filesystem_name,
     std::string* filesystem_id);