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

net/net.gyp

Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index ea0cd9d53b6b80c445e6e1a15d0db61689e99141..562746927f57ae8f119aa850d7c85d08802b5831 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -1709,27 +1709,29 @@
         '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',
@@ -2132,6 +2134,13 @@
             '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',
@@ -2443,8 +2452,8 @@
         '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',