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

webkit/fileapi/file_system_directory_database.h

Index: webkit/fileapi/file_system_directory_database.h
diff --git a/webkit/fileapi/file_system_directory_database.h b/webkit/fileapi/file_system_directory_database.h
index 187b7c4e23c846f2cd276bf4e01483d53a61508a..7a52c56c4e272c29d9bddc3176b459510018cede 100644
--- a/webkit/fileapi/file_system_directory_database.h
+++ b/webkit/fileapi/file_system_directory_database.h
@@ -11,7 +11,7 @@
 #include "base/file_path.h"
 #include "base/memory/scoped_ptr.h"
 #include "base/time.h"
-#include "webkit/fileapi/fileapi_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace tracked_objects {
 class Location;
@@ -34,11 +34,11 @@ namespace fileapi {
 // TODO(ericu): Safe mode, which does more checks such as the above on debug
 // builds.
 // TODO(ericu): Add a method that will give a unique filename for a data file.
-class FILEAPI_EXPORT_PRIVATE FileSystemDirectoryDatabase {
+class WEBKIT_STORAGE_EXPORT_PRIVATE FileSystemDirectoryDatabase {
  public:
   typedef int64 FileId;
 
-  struct FILEAPI_EXPORT_PRIVATE FileInfo {
+  struct WEBKIT_STORAGE_EXPORT_PRIVATE FileInfo {
     FileInfo();
     ~FileInfo();