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

webkit/fileapi/file_system_url.h

Index: webkit/fileapi/file_system_url.h
diff --git a/webkit/fileapi/file_system_url.h b/webkit/fileapi/file_system_url.h
index 4df6094067af7038337568e79078d2823b2f7c66..c2c93ff478c71391026fd4b0e764e176c23683b6 100644
--- a/webkit/fileapi/file_system_url.h
+++ b/webkit/fileapi/file_system_url.h
@@ -10,7 +10,7 @@
 #include "base/platform_file.h"
 #include "googleurl/src/gurl.h"
 #include "webkit/fileapi/file_system_types.h"
-#include "webkit/fileapi/fileapi_export.h"
+#include "webkit/storage/webkit_storage_export.h"
 
 namespace fileapi {
 
@@ -47,7 +47,7 @@ namespace fileapi {
 // special treatment, as it may contain paths that are illegal on the current
 // platform.  To avoid problems, use VirtualPath::BaseName and
 // VirtualPath::GetComponents instead of the FilePath methods.
-class FILEAPI_EXPORT FileSystemURL {
+class WEBKIT_STORAGE_EXPORT FileSystemURL {
  public:
   FileSystemURL();
   explicit FileSystemURL(const GURL& filesystem_url);
@@ -98,7 +98,7 @@ class FILEAPI_EXPORT FileSystemURL {
 
   bool operator==(const FileSystemURL& that) const;
 
-  struct FILEAPI_EXPORT Comparator {
+  struct WEBKIT_STORAGE_EXPORT Comparator {
     bool operator() (const FileSystemURL& lhs, const FileSystemURL& rhs) const;
   };