Reorganize net/disk_cache into backend specific directories.

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_tracing_cache_backend%': 0,
@@ skipping 327 matching lines @@
         'cookies/cookie_constants.h',
         'cookies/cookie_monster.cc',
         'cookies/cookie_monster.h',
         'cookies/cookie_options.h',
         'cookies/cookie_store.cc',
         'cookies/cookie_store.h',
         'cookies/cookie_util.cc',
         '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/cache_creator.cc',
         'disk_cache/cache_util.h',
         'disk_cache/cache_util.cc',
         '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',
         'disk_cache/simple/simple_entry_format.cc',
         'disk_cache/simple/simple_entry_format.h',
         'disk_cache/simple/simple_entry_format_history.h',
         'disk_cache/simple/simple_entry_impl.cc',
         'disk_cache/simple/simple_entry_impl.h',
         'disk_cache/simple/simple_entry_operation.cc',
         'disk_cache/simple/simple_entry_operation.h',
         'disk_cache/simple/simple_histogram_macros.h' ,
         'disk_cache/simple/simple_index.cc',
         'disk_cache/simple/simple_index.h',
         'disk_cache/simple/simple_index_delegate.h',
         'disk_cache/simple/simple_index_file.cc',
         'disk_cache/simple/simple_index_file.h',
         'disk_cache/simple/simple_index_file_posix.cc',
         'disk_cache/simple/simple_index_file_win.cc',
         'disk_cache/simple/simple_net_log_parameters.cc',
         'disk_cache/simple/simple_net_log_parameters.h',
         'disk_cache/simple/simple_synchronous_entry.cc',
         'disk_cache/simple/simple_synchronous_entry.h',
         'disk_cache/simple/simple_util.cc',
         '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/tracing/tracing_cache_backend.cc',

[rvargas (doing something else), 2014/02/06 04:21:23]

Having two files on a directory seems overkill. We should leave them at the
root.

+        'disk_cache/tracing/tracing_cache_backend.h',
+        'disk_cache/v2/addr.cc',
+        'disk_cache/v2/addr.h',
+        'disk_cache/v2/backend_impl.cc',
+        'disk_cache/v2/backend_impl.h',
+        'disk_cache/v2/bitmap.cc',
+        'disk_cache/v2/bitmap.h',
+        'disk_cache/v2/block_files.cc',
+        'disk_cache/v2/block_files.h',
+        'disk_cache/v2/disk_format.cc',
+        'disk_cache/v2/disk_format.h',
+        'disk_cache/v2/disk_format_base.h',
+        'disk_cache/v2/entry_impl.cc',
+        'disk_cache/v2/entry_impl.h',
+        'disk_cache/v2/errors.h',
+        'disk_cache/v2/eviction.cc',
+        'disk_cache/v2/eviction.h',
+        'disk_cache/v2/experiments.h',
+        'disk_cache/v2/file.cc',
+        'disk_cache/v2/file.h',
+        'disk_cache/v2/file_block.h',
+        'disk_cache/v2/file_ios.cc',
+        'disk_cache/v2/file_lock.cc',
+        'disk_cache/v2/file_lock.h',
+        'disk_cache/v2/file_posix.cc',
+        'disk_cache/v2/file_win.cc',
+        'disk_cache/v2/histogram_macros.h',
+        'disk_cache/v2/in_flight_backend_io.cc',
+        'disk_cache/v2/in_flight_backend_io.h',
+        'disk_cache/v2/in_flight_io.cc',
+        'disk_cache/v2/in_flight_io.h',
+        'disk_cache/v2/mapped_file.cc',
+        'disk_cache/v2/mapped_file.h',
+        'disk_cache/v2/mapped_file_posix.cc',
+        'disk_cache/v2/mapped_file_avoid_mmap_posix.cc',
+        'disk_cache/v2/mapped_file_win.cc',
+        'disk_cache/v2/rankings.cc',
+        'disk_cache/v2/rankings.h',
+        'disk_cache/v2/sparse_control.cc',
+        'disk_cache/v2/sparse_control.h',
+        'disk_cache/v2/stats.cc',
+        'disk_cache/v2/stats.h',
+        'disk_cache/v2/stats_histogram.cc',
+        'disk_cache/v2/stats_histogram.h',
+        'disk_cache/v2/storage_block-inl.h',
+        'disk_cache/v2/storage_block.h',
+        'disk_cache/v2/stress_support.h',
+        'disk_cache/v2/trace.cc',
+        'disk_cache/v2/trace.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',
         'dns/address_sorter.h',
         'dns/address_sorter_posix.cc',
         'dns/address_sorter_posix.h',
         'dns/address_sorter_win.cc',
         'dns/dns_client.cc',
         'dns/dns_client.h',
         'dns/dns_config_service.cc',
         'dns/dns_config_service.h',
@@ skipping 825 matching lines @@
         ['posix_avoid_mmap==1', {
           'defines': [
             'POSIX_AVOID_MMAP',
           ],
           'direct_dependent_settings': {
             'defines': [
               'POSIX_AVOID_MMAP',
             ],
           },
           'sources!': [
-            'disk_cache/mapped_file_posix.cc',
+            'disk_cache/v2/mapped_file_posix.cc',
           ],
         }, { # else
           'sources!': [
-            'disk_cache/mapped_file_avoid_mmap_posix.cc',
+            'disk_cache/v2/mapped_file_avoid_mmap_posix.cc',
           ],
         }],
         ['disable_ftp_support==1', {
           'sources/': [
             ['exclude', '^ftp/'],
           ],
           'sources!': [
             'url_request/ftp_protocol_handler.cc',
             'url_request/ftp_protocol_handler.h',
             'url_request/url_request_ftp_job.cc',
@@ skipping 369 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/addr_unittest.cc',
         'disk_cache/backend_unittest.cc',
-        'disk_cache/bitmap_unittest.cc',
-        'disk_cache/block_files_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_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/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',
@@ skipping 1057 matching lines @@
         },
         {
           'target_name': 'stress_cache',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
             'net',
             'net_test_support',
           ],
           'sources': [
-            'disk_cache/stress_cache.cc',
+            'disk_cache/v2/stress_cache.cc',
           ],
           # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
           'msvs_disabled_warnings': [4267, ],
         },
         {
           'target_name': 'tld_cleanup',
           'type': 'executable',
           'dependencies': [
             '../base/base.gyp:base',
             '../base/base.gyp:base_i18n',
@@ skipping 370 matching lines @@
             'net_unittests.isolate',
           ],
           'sources': [
             'net_unittests.isolate',
           ],
         },
       ],
     }],
   ],
 }