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

content/content_tests.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': 'test_support_content',
       'type': 'static_library',
       'defines!': ['CONTENT_IMPLEMENTATION'],
@@ skipping 218 matching lines @@
       'defines!': ['CONTENT_IMPLEMENTATION'],
       'dependencies': [
         'content_common',
         'test_support_content',
         'browser/speech/proto/speech_proto.gyp:speech_proto',
         '../base/base.gyp:test_support_base',
         '../crypto/crypto.gyp:crypto',
         '../media/media.gyp:media_test_support',
         '../net/net.gyp:net_test_support',
         '../skia/skia.gyp:skia',
+        '../sql/sql.gyp:sql',
         '../testing/gmock.gyp:gmock',
         '../testing/gtest.gyp:gtest',
         '../ui/ui.gyp:ui',
         '../webkit/support/webkit_support.gyp:user_agent',
       ],
       'include_dirs': [
         '..',
       ],
       'sources': [
         'browser/accessibility/browser_accessibility_mac_unittest.mm',
@@ skipping 139 matching lines @@
         '../webkit/blob/blob_url_request_job_unittest.cc',
         '../webkit/blob/local_file_stream_reader_unittest.cc',
         '../webkit/blob/mock_blob_url_request_context.cc',
         '../webkit/blob/mock_blob_url_request_context.h',
         '../webkit/blob/shareable_file_reference_unittest.cc',
         '../webkit/database/database_connections_unittest.cc',
         '../webkit/database/database_quota_client_unittest.cc',
         '../webkit/database/databases_table_unittest.cc',
         '../webkit/database/database_tracker_unittest.cc',
         '../webkit/database/database_util_unittest.cc',
-        '../webkit/database/quota_table_unittest.cc',
         '../webkit/dom_storage/dom_storage_area_unittest.cc',
         '../webkit/dom_storage/dom_storage_cached_area_unittest.cc',
         '../webkit/dom_storage/dom_storage_context_unittest.cc',
         '../webkit/dom_storage/dom_storage_database_unittest.cc',
         '../webkit/dom_storage/dom_storage_map_unittest.cc',
         '../webkit/dom_storage/session_storage_database_unittest.cc',
         '../webkit/fileapi/file_system_database_test_helper.cc',
         '../webkit/fileapi/file_system_database_test_helper.h',
         '../webkit/fileapi/file_system_directory_database_unittest.cc',
         '../webkit/fileapi/file_system_dir_url_request_job_unittest.cc',
@@ skipping 77 matching lines @@
             '../base/third_party/dynamic_annotations/dynamic_annotations.gyp:dynamic_annotations',
             '../gpu/gpu.gyp:gpu_unittest_utils',
             '../ipc/ipc.gyp:test_support_ipc',
             '../jingle/jingle.gyp:jingle_glue_test_util',
             '../media/media.gyp:shared_memory_support',
             '../third_party/leveldatabase/leveldatabase.gyp:leveldatabase',
             '../third_party/libjingle/libjingle.gyp:libjingle',
             '<(webkit_src_dir)/Source/WebKit/chromium/WebKit.gyp:webkit',
             '../ui/gl/gl.gyp:gl',
             '../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:webkit_base',
             '../webkit/support/webkit_support.gyp:webkit_media',
             '../webkit/support/webkit_support.gyp:webkit_storage',
             '../webkit/webkit.gyp:test_shell_test_support',
           ],
         }],
         ['enable_webrtc==1', {
           'sources': [
             'browser/renderer_host/p2p/socket_host_test_utils.h',
             'browser/renderer_host/p2p/socket_host_tcp_unittest.cc',
@@ skipping 410 matching lines @@
             'java_in_dir': '../content/shell/android/javatests',
             'resource_dir': '../res',
             'additional_src_dirs': ['../content/public/android/javatests/'],
           },
           'includes': [ '../build/java_apk.gypi' ],
         },
       ],
     }],
   ],
 }