webkit: Merge build target 'appcache' 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 ae261507f02d6c436f1f49193906b9fd22ad54fb..189631273da3750b8d2d5399de279d7505a1060b 100644
--- a/webkit/storage/webkit_storage.gypi
+++ b/webkit/storage/webkit_storage.gypi
@@ -13,6 +13,7 @@
     ],
   },
   'includes': [
+    '../appcache/webkit_appcache.gypi',
     '../blob/webkit_blob.gypi',
     '../fileapi/webkit_fileapi.gypi',
   ],
@@ -27,6 +28,7 @@
         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
         '<(DEPTH)/net/net.gyp:net',
+        '<(DEPTH)/sql/sql.gyp:sql',
         '<(DEPTH)/third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
         '<(DEPTH)/webkit/support/webkit_support.gyp:quota',
         '<(DEPTH)/webkit/support/webkit_support.gyp:webkit_base',
@@ -36,6 +38,7 @@
       'sources': [
         # TODO(hashimoto): Import all storage related modules. crbug.com/155242
         '../storage/webkit_storage_export.h',
+        '<@(webkit_appcache_sources)',
         '<@(webkit_blob_sources)',
         '<@(webkit_fileapi_sources)',
       ],