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

Replace build targets 'blob' and 'fileapi' with newly introduced 'webkit_storage'
Introduce a new directory webkit/storage to host webkit_storage.gypi and webkit_storage_export.h
Replace BLOB_EXPORT and FILEAPI_EXPORT with WEBKIT_STORAGE_EXPORT

BUG=155242
TEST=build
TBR=darin@chromium.org, piman@chromium.org

Review URL: https://chromiumcodereview.appspot.com/11103031

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@162679 0039d316-1c4b-4281-b951-d872f2087c98

6 files changed, 19 insertions, 17 deletions

diff --git a/webkit/fileapi/syncable/file_change.h b/webkit/fileapi/syncable/file_change.h
index b28f867..f5b0aee 100644
--- a/webkit/fileapi/syncable/file_change.h
+++ b/webkit/fileapi/syncable/file_change.h
@@ -9,11 +9,11 @@
 #include <vector>
 
 #include "base/basictypes.h"
-#include "webkit/fileapi/fileapi_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace fileapi {
 
-class FILEAPI_EXPORT FileChange {
+class WEBKIT_STORAGE_EXPORT FileChange {
  public:
   enum ChangeType {
     FILE_CHANGE_ADD_OR_UPDATE,
@@ -48,7 +48,7 @@ class FILEAPI_EXPORT FileChange {
   FileType file_type_;
 };
 
-class FILEAPI_EXPORT FileChangeList {
+class WEBKIT_STORAGE_EXPORT FileChangeList {
  public:
   FileChangeList();
   ~FileChangeList();
diff --git a/webkit/fileapi/syncable/local_file_change_tracker.h b/webkit/fileapi/syncable/local_file_change_tracker.h
index 269e9f7..9e5c83e 100644
--- a/webkit/fileapi/syncable/local_file_change_tracker.h
+++ b/webkit/fileapi/syncable/local_file_change_tracker.h
@@ -16,9 +16,9 @@
 #include "base/memory/scoped_ptr.h"
 #include "webkit/fileapi/file_observers.h"
 #include "webkit/fileapi/file_system_url.h"
-#include "webkit/fileapi/fileapi_export.h"
 #include "webkit/fileapi/syncable/file_change.h"
 #include "webkit/fileapi/syncable/sync_status_code.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace base {
 class SequencedTaskRunner;
@@ -31,7 +31,7 @@ class FileSystemContext;
 // Tracks local file changes for cloud-backed file systems.
 // All methods must be called on the file_task_runner given to the constructor.
 // Owned by FileSystemContext.
-class FILEAPI_EXPORT LocalFileChangeTracker
+class WEBKIT_STORAGE_EXPORT LocalFileChangeTracker
     : public FileUpdateObserver,
       public FileChangeObserver {
  public:
diff --git a/webkit/fileapi/syncable/local_file_sync_context.h b/webkit/fileapi/syncable/local_file_sync_context.h
index 9ecc327..aeba4d4 100644
--- a/webkit/fileapi/syncable/local_file_sync_context.h
+++ b/webkit/fileapi/syncable/local_file_sync_context.h
@@ -16,9 +16,9 @@
 #include "base/memory/ref_counted.h"
 #include "base/memory/scoped_ptr.h"
 #include "googleurl/src/gurl.h"
-#include "webkit/fileapi/fileapi_export.h"
 #include "webkit/fileapi/syncable/file_change.h"
 #include "webkit/fileapi/syncable/sync_status_code.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace base {
 class SingleThreadTaskRunner;
@@ -34,7 +34,7 @@ class LocalFileChangeTracker;
 // object and may exist multiple in a profile).
 // An instance of this class is shared by FileSystemContexts and outlives
 // LocalFileSyncService.
-class FILEAPI_EXPORT LocalFileSyncContext
+class WEBKIT_STORAGE_EXPORT LocalFileSyncContext
     : public base::RefCountedThreadSafe<LocalFileSyncContext> {
  public:
   typedef base::Callback<void(SyncStatusCode status)> StatusCallback;
diff --git a/webkit/fileapi/syncable/local_file_sync_status.h b/webkit/fileapi/syncable/local_file_sync_status.h
index 94420bd..3410a54 100644
--- a/webkit/fileapi/syncable/local_file_sync_status.h
+++ b/webkit/fileapi/syncable/local_file_sync_status.h
@@ -25,7 +25,7 @@ namespace fileapi {
 // An invariant of this class is: no FileSystem objects should be both
 // in syncing_ and writing_ status, i.e. trying to increment writing
 // while the target url is in syncing must fail and vice versa.
-class FILEAPI_EXPORT LocalFileSyncStatus : public base::NonThreadSafe {
+class WEBKIT_STORAGE_EXPORT LocalFileSyncStatus : public base::NonThreadSafe {
  public:
   LocalFileSyncStatus();
   ~LocalFileSyncStatus();
diff --git a/webkit/fileapi/syncable/sync_status_code.h b/webkit/fileapi/syncable/sync_status_code.h
index 2ec7f80..1bab048 100644
--- a/webkit/fileapi/syncable/sync_status_code.h
+++ b/webkit/fileapi/syncable/sync_status_code.h
@@ -5,7 +5,7 @@
 #ifndef WEBKIT_FILEAPI_SYNCABLE_SYNC_STATUS_CODE_H_
 #define WEBKIT_FILEAPI_SYNCABLE_SYNC_STATUS_CODE_H_
 
-#include "webkit/fileapi/fileapi_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace leveldb {
 class Status;
@@ -41,7 +41,7 @@ enum SyncStatusCode {
   SYNC_DATABASE_ERROR_FAILED = -19,
 };
 
-FILEAPI_EXPORT SyncStatusCode LevelDBStatusToSyncStatusCode(
+WEBKIT_STORAGE_EXPORT SyncStatusCode LevelDBStatusToSyncStatusCode(
     const leveldb::Status& status);
 
 }  // namespace fileapi
diff --git a/webkit/fileapi/syncable/syncable_file_system_util.h b/webkit/fileapi/syncable/syncable_file_system_util.h
index d00092c..dcdb024 100644
--- a/webkit/fileapi/syncable/syncable_file_system_util.h
+++ b/webkit/fileapi/syncable/syncable_file_system_util.h
@@ -9,19 +9,21 @@
 
 #include "base/file_path.h"
 #include "webkit/fileapi/file_system_url.h"
-#include "webkit/fileapi/fileapi_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace fileapi {
 
 // Registers a syncable filesystem with the given |service_name|.
-FILEAPI_EXPORT bool RegisterSyncableFileSystem(const std::string& service_name);
+WEBKIT_STORAGE_EXPORT bool RegisterSyncableFileSystem(
+    const std::string& service_name);
 
 // Revokes the syncable filesystem that was registered with |service_name|.
-FILEAPI_EXPORT bool RevokeSyncableFileSystem(const std::string& service_name);
+WEBKIT_STORAGE_EXPORT bool RevokeSyncableFileSystem(
+    const std::string& service_name);
 
 // Returns the root URI of the syncable filesystem that can be specified by a
 // pair of |origin| and |service_name|.
-FILEAPI_EXPORT GURL GetSyncableFileSystemRootURI(
+WEBKIT_STORAGE_EXPORT GURL GetSyncableFileSystemRootURI(
     const GURL& origin, const std::string& service_name);
 
 // Creates a FileSystem URL for the |path| in a syncable filesystem
@@ -32,7 +34,7 @@ FILEAPI_EXPORT GURL GetSyncableFileSystemRootURI(
 //   service_name: 'service_name',
 //   path: '/foo/bar',
 // returns 'filesystem:http://www.example.com/external/service_name/foo/bar'
-FILEAPI_EXPORT FileSystemURL CreateSyncableFileSystemURL(
+WEBKIT_STORAGE_EXPORT FileSystemURL CreateSyncableFileSystemURL(
     const GURL& origin, const std::string& service_name, const FilePath& path);
 
 // Serializes a given FileSystemURL |url| and sets the serialized string to
@@ -50,7 +52,7 @@ FILEAPI_EXPORT FileSystemURL CreateSyncableFileSystemURL(
 //   'filesystem:http://www.example.com/external/service_name/foo\\bar'
 // (on others)
 //   'filesystem:http://www.example.com/external/service_name/foo/bar'
-FILEAPI_EXPORT bool SerializeSyncableFileSystemURL(
+WEBKIT_STORAGE_EXPORT bool SerializeSyncableFileSystemURL(
     const FileSystemURL& url, std::string* serialized_url);
 
 // Deserializes a serialized FileSystem URL string |serialized_url| and sets the
@@ -63,7 +65,7 @@ FILEAPI_EXPORT bool SerializeSyncableFileSystemURL(
 // behavior).
 //
 // See the comment of SerializeSyncableFileSystemURL() for more details.
-FILEAPI_EXPORT bool DeserializeSyncableFileSystemURL(
+WEBKIT_STORAGE_EXPORT bool DeserializeSyncableFileSystemURL(
     const std::string& serialized_url, FileSystemURL* url);
 
 }  // namespace fileapi