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

webkit/support/webkit_support.gypi

 # Copyright (c) 2012 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 {
   'variables': {
     'chromium_code': 1,
   },
   'targets': [
     {
       'target_name': 'webkit_support',
       'type': 'static_library',
       'variables': { 'enable_wexit_time_destructors': 1, },
       'dependencies': [
         '<(DEPTH)/base/base.gyp:base',
         '<(DEPTH)/base/base.gyp:base_i18n',
         '<(DEPTH)/base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
         '<(DEPTH)/media/media.gyp:media',
         '<(DEPTH)/net/net.gyp:net',
         '<(DEPTH)/skia/skia.gyp:skia',
         '<(DEPTH)/testing/gtest.gyp:gtest',
         '<(DEPTH)/third_party/hyphen/hyphen.gyp:hyphen',
         '<(DEPTH)/ui/ui.gyp:ui',
-        'database',
         'glue',
         'user_agent',
         'webkit_base',
         'webkit_gpu',
         'webkit_media',
         'webkit_storage',
         'webkit_support_common',
       ],
       'include_dirs': [
         '<(SHARED_INTERMEDIATE_DIR)/webkit', # for a header generated by grit
@@ skipping 128 matching lines @@
         '<(DEPTH)',
       ],
       'conditions': [
           ['OS=="android"', {
               'toolsets': ['target', 'host'],
           }],
       ],
     },
   ],
 }