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

webkit/storage/webkit_storage.gypi

Index: webkit/storage/webkit_storage.gypi
diff --git a/webkit/blob/webkit_blob.gypi b/webkit/storage/webkit_storage.gypi
similarity index 59%
copy from webkit/blob/webkit_blob.gypi
copy to webkit/storage/webkit_storage.gypi
index 0e786c4f97a76383a1f1f79cdc9ed0253ea07fa9..ae261507f02d6c436f1f49193906b9fd22ad54fb 100644
--- a/webkit/blob/webkit_blob.gypi
+++ b/webkit/storage/webkit_storage.gypi
@@ -10,11 +10,15 @@
       },{
         'webkit_src_dir': '../../third_party/WebKit',
       }],
-      ],
-    },
+    ],
+  },
+  'includes': [
+    '../blob/webkit_blob.gypi',
+    '../fileapi/webkit_fileapi.gypi',
+  ],
   'targets': [
     {
-      'target_name': 'blob',
+      'target_name': 'webkit_storage',
       'type': '<(component)',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
@@ -23,27 +27,17 @@
         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(DEPTH)/net/net.gyp:net',
+        '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
+        '<(DEPTH)/webkit/support/webkit_support.gyp:quota',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_base',
         '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
       ],
-      'defines': [
-        'BLOB_IMPLEMENTATION'
-      ],
+      'defines': ['WEBKIT_STORAGE_IMPLEMENTATION'],
       'sources': [
-        'blob_data.cc',
-        'blob_data.h',
-        'blob_storage_controller.cc',
-        'blob_storage_controller.h',
-        'blob_url_request_job.cc',
-        'blob_url_request_job.h',
-        'blob_url_request_job_factory.cc',
-        'blob_url_request_job_factory.h',
-        'local_file_stream_reader.cc',
-        'local_file_stream_reader.h',
-        'shareable_file_reference.cc',
-        'shareable_file_reference.h',
-        'view_blob_internals_job.cc',
-        'view_blob_internals_job.h',
+        # TODO(hashimoto): Import all storage related modules. crbug.com/155242
+        '../storage/webkit_storage_export.h',
+        '<@(webkit_blob_sources)',
+        '<@(webkit_fileapi_sources)',
       ],
       'conditions': [
         ['inside_chromium_build==0', {
@@ -51,6 +45,16 @@
             '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
           ],
         }],
+        ['chromeos==1', {
+          'sources': [
+            '<@(webkit_fileapi_chromeos_sources)',
+          ],
+        }],
+        ['OS=="linux" or chromeos==1', {
+          'sources': [
+            '<@(webkit_fileapi_media_sources)',
+          ],
+        }],
       ],
     },
   ],