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

webkit/quota/webkit_quota.gypi

Index: webkit/quota/webkit_quota.gypi
diff --git a/webkit/quota/webkit_quota.gypi b/webkit/quota/webkit_quota.gypi
index 240516a6789ca18f48c5d7b238c00de9bbb1b948..a43600e6f5832d199e02912ace2b9a76e3a6a3e7 100644
--- a/webkit/quota/webkit_quota.gypi
+++ b/webkit/quota/webkit_quota.gypi
@@ -3,40 +3,22 @@
 # found in the LICENSE file.
 
 {
-  'targets': [
-    {
-      'target_name': 'quota',
-      'type': 'static_library',
-      'variables': { 'enable_wexit_time_destructors': 1, },
-      'dependencies': [
-        '<(DEPTH)/base/base.gyp:base',
-        '<(DEPTH)/build/temp_gyp/googleurl.gyp:googleurl',
-        '<(DEPTH)/net/net.gyp:net',
-        '<(DEPTH)/sql/sql.gyp:sql',
-      ],
-      'sources': [
-        'quota_client.h',
-        'quota_database.cc',
-        'quota_database.h',
-        'quota_manager.cc',
-        'quota_manager.h',
-        'quota_task.cc',
-        'quota_task.h',
-        'quota_temporary_storage_evictor.cc',
-        'quota_temporary_storage_evictor.h',
-        'quota_types.h',
-        'special_storage_policy.cc',
-        'special_storage_policy.h',
-        'usage_tracker.cc',
-        'usage_tracker.h',
-      ],
-      'conditions': [
-        ['inside_chromium_build==0', {
-          'dependencies': [
-            '<(DEPTH)/webkit/support/setup_third_party.gyp:third_party_headers',
-          ],
-        }],
-      ],
-    },
-  ],
+  'variables': {
+    'webkit_quota_sources': [
+      '../quota/quota_client.h',
+      '../quota/quota_database.cc',
+      '../quota/quota_database.h',
+      '../quota/quota_manager.cc',
+      '../quota/quota_manager.h',
+      '../quota/quota_task.cc',
+      '../quota/quota_task.h',
+      '../quota/quota_temporary_storage_evictor.cc',
+      '../quota/quota_temporary_storage_evictor.h',
+      '../quota/quota_types.h',
+      '../quota/special_storage_policy.cc',
+      '../quota/special_storage_policy.h',
+      '../quota/usage_tracker.cc',
+      '../quota/usage_tracker.h',
+    ],
+  },
 }