Reland re-organization of net/disk_cache/

Originally this landed from https://codereview.chromium.org/121643003/ ,
but reverted due to an iOS build break.

BUG=331062
TBR=mmenke@chromium.org,rvargas@chromium.org

Review URL: https://codereview.chromium.org/185003007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@254474 0039d316-1c4b-4281-b951-d872f2087c98

1 files changed, 100 insertions, 99 deletions

diff --git a/net/net.gyp b/net/net.gyp
index 7a09502..978b1bf 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -349,70 +349,93 @@
         'cookies/cookie_util.h',
         'cookies/parsed_cookie.cc',
         'cookies/parsed_cookie.h',
-        'disk_cache/addr.cc',
-        'disk_cache/addr.h',
-        'disk_cache/backend_impl.cc',
-        'disk_cache/backend_impl.h',
-        'disk_cache/bitmap.cc',
-        'disk_cache/bitmap.h',
-        'disk_cache/block_files.cc',
-        'disk_cache/block_files.h',
+        'disk_cache/blockfile/addr.cc',
+        'disk_cache/blockfile/addr.h',
+        'disk_cache/blockfile/backend_impl.cc',
+        'disk_cache/blockfile/backend_impl.h',
+        'disk_cache/blockfile/backend_impl_v3.cc',
+        'disk_cache/blockfile/backend_impl_v3.h',
+        'disk_cache/blockfile/bitmap.cc',
+        'disk_cache/blockfile/bitmap.h',
+        'disk_cache/blockfile/block_bitmaps_v3.cc',
+        'disk_cache/blockfile/block_bitmaps_v3.h',
+        'disk_cache/blockfile/block_files.cc',
+        'disk_cache/blockfile/block_files.h',
+        'disk_cache/blockfile/disk_format.cc',
+        'disk_cache/blockfile/disk_format.h',
+        'disk_cache/blockfile/disk_format_base.h',
+        'disk_cache/blockfile/disk_format_v3.h',
+        'disk_cache/blockfile/entry_impl.cc',
+        'disk_cache/blockfile/entry_impl.h',
+        'disk_cache/blockfile/entry_impl_v3.cc',
+        'disk_cache/blockfile/entry_impl_v3.h',
+        'disk_cache/blockfile/errors.h',
+        'disk_cache/blockfile/eviction.cc',
+        'disk_cache/blockfile/eviction.h',
+        'disk_cache/blockfile/eviction_v3.cc',
+        'disk_cache/blockfile/eviction_v3.h',
+        'disk_cache/blockfile/experiments.h',
+        'disk_cache/blockfile/file.cc',
+        'disk_cache/blockfile/file.h',
+        'disk_cache/blockfile/file_block.h',
+        'disk_cache/blockfile/file_ios.cc',
+        'disk_cache/blockfile/file_lock.cc',
+        'disk_cache/blockfile/file_lock.h',
+        'disk_cache/blockfile/file_posix.cc',
+        'disk_cache/blockfile/file_win.cc',
+        'disk_cache/blockfile/histogram_macros.h',
+        'disk_cache/blockfile/histogram_macros_v3.h',
+        'disk_cache/blockfile/in_flight_backend_io.cc',
+        'disk_cache/blockfile/in_flight_backend_io.h',
+        'disk_cache/blockfile/in_flight_io.cc',
+        'disk_cache/blockfile/in_flight_io.h',
+        'disk_cache/blockfile/index_table_v3.cc',
+        'disk_cache/blockfile/index_table_v3.h',
+        'disk_cache/blockfile/mapped_file.cc',
+        'disk_cache/blockfile/mapped_file.h',
+        'disk_cache/blockfile/mapped_file_avoid_mmap_posix.cc',
+        'disk_cache/blockfile/mapped_file_posix.cc',
+        'disk_cache/blockfile/mapped_file_win.cc',
+        'disk_cache/blockfile/rankings.cc',
+        'disk_cache/blockfile/rankings.h',
+        'disk_cache/blockfile/sparse_control.cc',
+        'disk_cache/blockfile/sparse_control.h',
+        'disk_cache/blockfile/stats.cc',
+        'disk_cache/blockfile/stats.h',
+        'disk_cache/blockfile/stats_histogram.cc',
+        'disk_cache/blockfile/stats_histogram.h',
+        'disk_cache/blockfile/storage_block-inl.h',
+        'disk_cache/blockfile/storage_block.h',
+        'disk_cache/blockfile/stress_support.h',
+        'disk_cache/blockfile/trace.cc',
+        'disk_cache/blockfile/trace.h',
         'disk_cache/cache_creator.cc',
-        'disk_cache/cache_util.h',
         'disk_cache/cache_util.cc',
+        'disk_cache/cache_util.h',
         'disk_cache/cache_util_posix.cc',
         'disk_cache/cache_util_win.cc',
         'disk_cache/disk_cache.h',
-        'disk_cache/disk_format.cc',
-        'disk_cache/disk_format.h',
-        'disk_cache/disk_format_base.h',
-        'disk_cache/entry_impl.cc',
-        'disk_cache/entry_impl.h',
-        'disk_cache/errors.h',
-        'disk_cache/eviction.cc',
-        'disk_cache/eviction.h',
-        'disk_cache/experiments.h',
-        'disk_cache/file.cc',
-        'disk_cache/file.h',
-        'disk_cache/file_block.h',
-        'disk_cache/file_ios.cc',
-        'disk_cache/file_lock.cc',
-        'disk_cache/file_lock.h',
-        'disk_cache/file_posix.cc',
-        'disk_cache/file_win.cc',
-        'disk_cache/histogram_macros.h',
-        'disk_cache/in_flight_backend_io.cc',
-        'disk_cache/in_flight_backend_io.h',
-        'disk_cache/in_flight_io.cc',
-        'disk_cache/in_flight_io.h',
-        'disk_cache/mapped_file.cc',
-        'disk_cache/mapped_file.h',
-        'disk_cache/mapped_file_posix.cc',
-        'disk_cache/mapped_file_avoid_mmap_posix.cc',
-        'disk_cache/mapped_file_win.cc',
-        'disk_cache/mem_backend_impl.cc',
-        'disk_cache/mem_backend_impl.h',
-        'disk_cache/mem_entry_impl.cc',
-        'disk_cache/mem_entry_impl.h',
-        'disk_cache/mem_rankings.cc',
-        'disk_cache/mem_rankings.h',
+        'disk_cache/flash/flash_entry_impl.cc',
+        'disk_cache/flash/flash_entry_impl.h',
+        'disk_cache/flash/format.h',
+        'disk_cache/flash/internal_entry.cc',
+        'disk_cache/flash/internal_entry.h',
+        'disk_cache/flash/log_store.cc',
+        'disk_cache/flash/log_store.h',
+        'disk_cache/flash/log_store_entry.cc',
+        'disk_cache/flash/log_store_entry.h',
+        'disk_cache/flash/segment.cc',
+        'disk_cache/flash/segment.h',
+        'disk_cache/flash/storage.cc',
+        'disk_cache/flash/storage.h',
+        'disk_cache/memory/mem_backend_impl.cc',
+        'disk_cache/memory/mem_backend_impl.h',
+        'disk_cache/memory/mem_entry_impl.cc',
+        'disk_cache/memory/mem_entry_impl.h',
+        'disk_cache/memory/mem_rankings.cc',
+        'disk_cache/memory/mem_rankings.h',
         'disk_cache/net_log_parameters.cc',
         'disk_cache/net_log_parameters.h',
-        'disk_cache/rankings.cc',
-        'disk_cache/rankings.h',
-        'disk_cache/sparse_control.cc',
-        'disk_cache/sparse_control.h',
-        'disk_cache/stats.cc',
-        'disk_cache/stats.h',
-        'disk_cache/stats_histogram.cc',
-        'disk_cache/stats_histogram.h',
-        'disk_cache/storage_block-inl.h',
-        'disk_cache/storage_block.h',
-        'disk_cache/stress_support.h',
-        'disk_cache/trace.cc',
-        'disk_cache/trace.h',
-        'disk_cache/tracing_cache_backend.cc',
-        'disk_cache/tracing_cache_backend.h',
         'disk_cache/simple/simple_backend_impl.cc',
         'disk_cache/simple/simple_backend_impl.h',
         'disk_cache/simple/simple_backend_version.h',
@@ -439,31 +462,8 @@
         'disk_cache/simple/simple_util.h',
         'disk_cache/simple/simple_version_upgrade.cc',
         'disk_cache/simple/simple_version_upgrade.h',
-        'disk_cache/flash/flash_entry_impl.cc',
-        'disk_cache/flash/flash_entry_impl.h',
-        'disk_cache/flash/format.h',
-        'disk_cache/flash/internal_entry.cc',
-        'disk_cache/flash/internal_entry.h',
-        'disk_cache/flash/log_store.cc',
-        'disk_cache/flash/log_store.h',
-        'disk_cache/flash/log_store_entry.cc',
-        'disk_cache/flash/log_store_entry.h',
-        'disk_cache/flash/segment.cc',
-        'disk_cache/flash/segment.h',
-        'disk_cache/flash/storage.cc',
-        'disk_cache/flash/storage.h',
-        'disk_cache/v3/backend_impl_v3.cc',
-        'disk_cache/v3/backend_impl_v3.h',
-        'disk_cache/v3/block_bitmaps.cc',
-        'disk_cache/v3/block_bitmaps.h',
-        'disk_cache/v3/disk_format_v3.h',
-        'disk_cache/v3/entry_impl_v3.cc',
-        'disk_cache/v3/entry_impl_v3.h',
-        'disk_cache/v3/eviction_v3.cc',
-        'disk_cache/v3/eviction_v3.h',
-        'disk_cache/v3/histogram_macros.h',
-        'disk_cache/v3/index_table.cc',
-        'disk_cache/v3/index_table.h',
+        'disk_cache/tracing/tracing_cache_backend.cc',
+        'disk_cache/tracing/tracing_cache_backend.h',
         'dns/address_sorter.h',
         'dns/address_sorter_posix.cc',
         'dns/address_sorter_posix.h',
@@ -1330,11 +1330,11 @@
             ],
           },
           'sources!': [
-            'disk_cache/mapped_file_posix.cc',
+            'disk_cache/blockfile/mapped_file_posix.cc',
           ],
         }, { # else
           'sources!': [
-            'disk_cache/mapped_file_avoid_mmap_posix.cc',
+            'disk_cache/blockfile/mapped_file_avoid_mmap_posix.cc',
           ],
         }],
         ['disable_ftp_support==1', {
@@ -1727,26 +1727,27 @@
         'cookies/cookie_store_unittest.h',
         'cookies/cookie_util_unittest.cc',
         'cookies/parsed_cookie_unittest.cc',
-        'disk_cache/addr_unittest.cc',
         'disk_cache/backend_unittest.cc',
-        'disk_cache/bitmap_unittest.cc',
-        'disk_cache/block_files_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/mapped_file_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/simple/simple_index_file_unittest.cc',
         'disk_cache/simple/simple_index_unittest.cc',
-        'disk_cache/simple/simple_test_util.h',
         '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/storage_block_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/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',
@@ -2165,7 +2166,7 @@
         [ 'OS == "android"', {
           'sources!': [
             # See bug 344533.
-            'disk_cache/v3/index_table_unittest.cc',
+            'disk_cache/blockfile/index_table_v3unittest.cc',
             # No res_ninit() et al on Android, so this doesn't make a lot of
             # sense.
             'dns/dns_config_service_posix_unittest.cc',
@@ -2415,7 +2416,7 @@
       ],
       'sources': [
         'cookies/cookie_monster_perftest.cc',
-        'disk_cache/disk_cache_perftest.cc',
+        'disk_cache/blockfile/disk_cache_perftest.cc',
         'proxy/proxy_resolver_perftest.cc',
       ],
       'conditions': [
@@ -2843,7 +2844,7 @@
             'net_test_support',
           ],
           'sources': [
-            'disk_cache/stress_cache.cc',
+            'disk_cache/blockfile/stress_cache.cc',
           ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [4267, ],