**STILLBAKING** Decouple disk cache tests from backends.

net/net.gyp

 # Copyright 2013 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,
 
     'linux_link_kerberos%': 0,
     'use_blockfile_cache_backend%': 1,
@@ skipping 1691 matching lines @@
         'cert/x509_cert_types_unittest.cc',
         'cert/x509_util_unittest.cc',
         'cert/x509_util_nss_unittest.cc',
         'cert/x509_util_openssl_unittest.cc',
         'cookies/canonical_cookie_unittest.cc',
         'cookies/cookie_constants_unittest.cc',
         'cookies/cookie_monster_unittest.cc',
         'cookies/cookie_store_unittest.h',
         'cookies/cookie_util_unittest.cc',
         'cookies/parsed_cookie_unittest.cc',
-        'disk_cache/backend_unittest.cc',
-        'disk_cache/blockfile/addr_unittest.cc',
-        'disk_cache/blockfile/bitmap_unittest.cc',
-        'disk_cache/blockfile/block_bitmaps_v3_unittest.cc',
-        'disk_cache/blockfile/block_bitmaps_v3_unittest.cc',
-        'disk_cache/blockfile/block_files_unittest.cc',
-        'disk_cache/blockfile/index_table_v3_unittest.cc',
-        'disk_cache/blockfile/mapped_file_unittest.cc',
-        'disk_cache/blockfile/storage_block_unittest.cc',
-        'disk_cache/cache_util_unittest.cc',
-        'disk_cache/entry_unittest.cc',
-        'disk_cache/flash/log_store_entry_unittest.cc',
-        'disk_cache/flash/log_store_unittest.cc',
-        'disk_cache/flash/segment_unittest.cc',
-        'disk_cache/flash/storage_unittest.cc',
+        'disk_cache/entry_sync_tests.cc',
+        'disk_cache/entry_sync_tests.h',
+        'disk_cache/backend_tests.cc',
+        'disk_cache/backend_tests.h',
+        'disk_cache/entry_tests.cc',
+        'disk_cache/entry_tests.h',
+        'disk_cache/v2/blockfile_unittest.cc',
+        'disk_cache/simple/simple_unittest.cc',
+        'disk_cache/memory/memory_unittest.cc',
         'disk_cache/simple/simple_index_file_unittest.cc',
         'disk_cache/simple/simple_index_unittest.cc',
         'disk_cache/simple/simple_test_util.cc',
         'disk_cache/simple/simple_test_util.h',
         'disk_cache/simple/simple_util_unittest.cc',
         'disk_cache/simple/simple_version_upgrade_unittest.cc',
+#        'disk_cache/v2/addr_unittest.cc',
+#        'disk_cache/v2/bitmap_unittest.cc',
+#        'disk_cache/v2/block_files_unittest.cc',
+#        'disk_cache/v2/mapped_file_unittest.cc',
+#        'disk_cache/v2/storage_block_unittest.cc',
+#        'disk_cache/v3/block_bitmaps_unittest.cc',
+#        'disk_cache/v3/block_bitmaps_unittest.cc',
+#        'disk_cache/v3/index_table_unittest.cc',
         'dns/address_sorter_posix_unittest.cc',
         'dns/address_sorter_unittest.cc',
         'dns/dns_config_service_posix_unittest.cc',
         'dns/dns_config_service_unittest.cc',
         'dns/dns_config_service_win_unittest.cc',
         'dns/dns_hosts_unittest.cc',
         'dns/dns_query_unittest.cc',
         'dns/dns_response_unittest.cc',
         'dns/dns_session_unittest.cc',
         'dns/dns_transaction_unittest.cc',
@@ skipping 382 matching lines @@
             'tools/quic/test_tools/quic_server_peer.cc',
             'tools/quic/test_tools/quic_server_peer.h',
             'tools/quic/test_tools/quic_test_client.cc',
             'tools/quic/test_tools/quic_test_client.h',
             'tools/quic/test_tools/quic_test_utils.cc',
             'tools/quic/test_tools/quic_test_utils.h',
             'tools/quic/test_tools/server_thread.h',
             'tools/quic/test_tools/server_thread.cc',
           ],
         }],
+        ['use_blockfile_cache_backend==1', {
+          'defines': [
+            'USE_BLOCKFILE_CACHE_BACKEND',
+          ],
+        }, { # use_blockfile_cache_backend == 0
+          'sources/': [ ['exclude', '^disk_cache/blockfile/' ] ]
+        }],
         ['chromeos==1', {
           'sources!': [
             'base/network_change_notifier_linux_unittest.cc',
             'proxy/proxy_config_service_linux_unittest.cc',
           ],
         }],
         [ 'OS == "android"', {
           'sources!': [
             # See bug 294367.
             'disk_cache/blockfile/index_table_v3_unittest.cc',
@@ skipping 291 matching lines @@
         'base/test_data_directory.cc',
         'base/test_data_directory.h',
         'cert/mock_cert_verifier.cc',
         'cert/mock_cert_verifier.h',
         'cookies/cookie_monster_store_test.cc',
         'cookies/cookie_monster_store_test.h',
         'cookies/cookie_store_test_callbacks.cc',
         'cookies/cookie_store_test_callbacks.h',
         'cookies/cookie_store_test_helpers.cc',
         'cookies/cookie_store_test_helpers.h',
-        'disk_cache/disk_cache_test_base.cc',
-        'disk_cache/disk_cache_test_base.h',
+        'disk_cache/disk_cache_test.cc',
+        'disk_cache/disk_cache_test.h',
         'disk_cache/disk_cache_test_util.cc',
         'disk_cache/disk_cache_test_util.h',
         'disk_cache/flash/flash_cache_test_base.h',
         'disk_cache/flash/flash_cache_test_base.cc',
         'dns/dns_test_util.cc',
         'dns/dns_test_util.h',
         'dns/mock_host_resolver.cc',
         'dns/mock_host_resolver.h',
         'dns/mock_mdns_socket_factory.cc',
         'dns/mock_mdns_socket_factory.h',
@@ skipping 731 matching lines @@
             'net_unittests.isolate',
           ],
           'sources': [
             'net_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }