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

chrome/chrome_browser.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.
 
 {
   'targets': [
     {
       'target_name': 'browser',
       'type': 'static_library',
@@ skipping 54 matching lines @@
         '../third_party/npapi/npapi.gyp:npapi',
         '../third_party/re2/re2.gyp:re2',
         '../third_party/zlib/zlib.gyp:minizip',
         '../third_party/zlib/zlib.gyp:zlib',
         '../ui/base/strings/ui_strings.gyp:ui_strings',
         '../ui/surface/surface.gyp:surface',
         '../ui/ui.gyp:ui',
         '../ui/ui.gyp:ui_resources',
         '../ui/web_dialogs/web_dialogs.gyp:web_dialogs',
         '../v8/tools/gyp/v8.gyp:v8',
-        '../webkit/support/webkit_support.gyp:database',
         '../webkit/support/webkit_support.gyp:glue',
-        '../webkit/support/webkit_support.gyp:quota',
         '../webkit/support/webkit_support.gyp:user_agent',
         '../webkit/support/webkit_support.gyp:webkit_resources',
         '../webkit/support/webkit_support.gyp:webkit_storage',
       ],
       'include_dirs': [
         '..',
         '<(INTERMEDIATE_DIR)',
         # Needed by pepper_flash_component_installer.cc.
         '<(SHARED_INTERMEDIATE_DIR)',
       ],
@@ skipping 2848 matching lines @@
             'proto_in_dir': '../third_party/cros_system_api/dbus',
             'proto_out_dir': 'chrome/browser/media_transfer_protocol',
           },
           'includes': ['../build/protoc.gypi'],
         },
       ],
      },
     ],
   ],
 }