Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(366)

Issues Search
    My Issues | Starred     Open | Closed | All

Unified Diff: net/net.gyp

Issue 121643003: Reorganize net/disk_cache into backend specific directories. (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: #define fixes Created 6 years, 10 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« net/disk_cache/v3/sparse_control_v3.h ('K') | « net/disk_cache/v3/sparse_control_v3.cc ('k') | net/tools/crash_cache/crash_cache.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/net.gyp
diff --git a/net/net.gyp b/net/net.gyp
index 3aac81c8d488f3334922f181224fc7c236c2bfaa..c192286995bc5a2ff434cb2ab1774926a70f68de 100644
--- a/net/net.gyp
+++ b/net/net.gyp
@@ -345,70 +345,33 @@
'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',
@@ -435,19 +398,56 @@
'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
+ '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',
@@ -457,6 +457,7 @@
'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',
@@ -1302,11 +1303,11 @@
],
},
'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', {
@@ -1696,24 +1697,25 @@
'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',
@@ -2791,7 +2793,7 @@
'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, ],
« net/disk_cache/v3/sparse_control_v3.h ('K') | « net/disk_cache/v3/sparse_control_v3.cc ('k') | net/tools/crash_cache/crash_cache.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698