webkit: Merge 'database' and 'quota' to 'webkit_storage'

webkit/storage/webkit_storage.gypi

Index: webkit/storage/webkit_storage.gypi
diff --git a/webkit/storage/webkit_storage.gypi b/webkit/storage/webkit_storage.gypi
index e38ffc784697d42e4d39f8a5cf9396f47a7042b3..344a2f10bfeeb2f11e417880195a7e5a8db38eef 100644
--- a/webkit/storage/webkit_storage.gypi
+++ b/webkit/storage/webkit_storage.gypi
@@ -15,8 +15,10 @@
   'includes': [
     '../appcache/webkit_appcache.gypi',
     '../blob/webkit_blob.gypi',
+    '../database/webkit_database.gypi',
     '../dom_storage/webkit_dom_storage.gypi',
     '../fileapi/webkit_fileapi.gypi',
+    '../quota/webkit_quota.gypi',
   ],
   'targets': [
     {
@@ -32,19 +34,18 @@
         '<(DEPTH)/sql/sql.gyp:sql',
         '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
         '<(DEPTH)/third_party/sqlite/sqlite.gyp:sqlite',
-        '<(DEPTH)/webkit/support/webkit_support.gyp:database',
-        '<(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': ['WEBKIT_STORAGE_IMPLEMENTATION'],
       'sources': [
-        # TODO(hashimoto): Import all storage related modules. crbug.com/155242
         '../storage/webkit_storage_export.h',
         '<@(webkit_appcache_sources)',
         '<@(webkit_blob_sources)',
+        '<@(webkit_database_sources)',
         '<@(webkit_dom_storage_sources)',
         '<@(webkit_fileapi_sources)',
+        '<@(webkit_quota_sources)',
       ],
       'conditions': [
         ['inside_chromium_build==0', {