| Index: net/disk_cache/entry_unittest.cc
|
| diff --git a/net/disk_cache/entry_unittest.cc b/net/disk_cache/entry_unittest.cc
|
| index 4b7e2bcbc30a4639c17a16ea63b8218a77dbbcd5..ff784edbf8355d3093a56408ec9e385e199442b8 100644
|
| --- a/net/disk_cache/entry_unittest.cc
|
| +++ b/net/disk_cache/entry_unittest.cc
|
| @@ -129,7 +129,6 @@ void DiskCacheEntryTest::InternalSyncIO() {
|
| }
|
|
|
| TEST_F(DiskCacheEntryTest, InternalSyncIO) {
|
| - SetDirectMode();
|
| InitCache();
|
| InternalSyncIO();
|
| }
|
| @@ -291,7 +290,6 @@ void DiskCacheEntryTest::InternalAsyncIO() {
|
| }
|
|
|
| TEST_F(DiskCacheEntryTest, InternalAsyncIO) {
|
| - SetDirectMode();
|
| InitCache();
|
| InternalAsyncIO();
|
| }
|
| @@ -362,13 +360,11 @@ void DiskCacheEntryTest::ExternalSyncIO() {
|
| }
|
|
|
| TEST_F(DiskCacheEntryTest, ExternalSyncIO) {
|
| - SetDirectMode();
|
| InitCache();
|
| ExternalSyncIO();
|
| }
|
|
|
| TEST_F(DiskCacheEntryTest, ExternalSyncIONoBuffer) {
|
| - SetDirectMode();
|
| InitCache();
|
| cache_impl_->SetFlags(disk_cache::kNoBuffering);
|
| ExternalSyncIO();
|
| @@ -492,13 +488,11 @@ void DiskCacheEntryTest::ExternalAsyncIO() {
|
| }
|
|
|
| TEST_F(DiskCacheEntryTest, ExternalAsyncIO) {
|
| - SetDirectMode();
|
| InitCache();
|
| ExternalAsyncIO();
|
| }
|
|
|
| TEST_F(DiskCacheEntryTest, ExternalAsyncIONoBuffer) {
|
| - SetDirectMode();
|
| InitCache();
|
| cache_impl_->SetFlags(disk_cache::kNoBuffering);
|
| ExternalAsyncIO();
|
| @@ -527,7 +521,6 @@ void DiskCacheEntryTest::ReleaseBuffer() {
|
| }
|
|
|
| TEST_F(DiskCacheEntryTest, ReleaseBuffer) {
|
| - SetDirectMode();
|
| InitCache();
|
| cache_impl_->SetFlags(disk_cache::kNoBuffering);
|
| ReleaseBuffer();
|
| @@ -761,7 +754,6 @@ TEST_F(DiskCacheEntryTest, GrowData) {
|
| }
|
|
|
| TEST_F(DiskCacheEntryTest, GrowDataNoBuffer) {
|
| - SetDirectMode();
|
| InitCache();
|
| cache_impl_->SetFlags(disk_cache::kNoBuffering);
|
| GrowData();
|
| @@ -839,7 +831,6 @@ TEST_F(DiskCacheEntryTest, TruncateData) {
|
| }
|
|
|
| TEST_F(DiskCacheEntryTest, TruncateDataNoBuffer) {
|
| - SetDirectMode();
|
| InitCache();
|
| cache_impl_->SetFlags(disk_cache::kNoBuffering);
|
| TruncateData();
|
| @@ -895,7 +886,6 @@ TEST_F(DiskCacheEntryTest, ZeroLengthIO) {
|
| }
|
|
|
| TEST_F(DiskCacheEntryTest, ZeroLengthIONoBuffer) {
|
| - SetDirectMode();
|
| InitCache();
|
| cache_impl_->SetFlags(disk_cache::kNoBuffering);
|
| ZeroLengthIO();
|
| @@ -990,7 +980,6 @@ TEST_F(DiskCacheEntryTest, Buffering) {
|
| }
|
|
|
| TEST_F(DiskCacheEntryTest, BufferingNoBuffer) {
|
| - SetDirectMode();
|
| InitCache();
|
| cache_impl_->SetFlags(disk_cache::kNoBuffering);
|
| Buffering();
|
| @@ -1077,7 +1066,6 @@ TEST_F(DiskCacheEntryTest, SizeChanges) {
|
| }
|
|
|
| TEST_F(DiskCacheEntryTest, SizeChangesNoBuffer) {
|
| - SetDirectMode();
|
| InitCache();
|
| cache_impl_->SetFlags(disk_cache::kNoBuffering);
|
| SizeChanges();
|
| @@ -1110,14 +1098,12 @@ void DiskCacheEntryTest::ReuseEntry(int size) {
|
| }
|
|
|
| TEST_F(DiskCacheEntryTest, ReuseExternalEntry) {
|
| - SetDirectMode();
|
| SetMaxSize(200 * 1024);
|
| InitCache();
|
| ReuseEntry(20 * 1024);
|
| }
|
|
|
| TEST_F(DiskCacheEntryTest, MemoryOnlyReuseExternalEntry) {
|
| - SetDirectMode();
|
| SetMemoryOnlyMode();
|
| SetMaxSize(200 * 1024);
|
| InitCache();
|
| @@ -1125,14 +1111,12 @@ TEST_F(DiskCacheEntryTest, MemoryOnlyReuseExternalEntry) {
|
| }
|
|
|
| TEST_F(DiskCacheEntryTest, ReuseInternalEntry) {
|
| - SetDirectMode();
|
| SetMaxSize(100 * 1024);
|
| InitCache();
|
| ReuseEntry(10 * 1024);
|
| }
|
|
|
| TEST_F(DiskCacheEntryTest, MemoryOnlyReuseInternalEntry) {
|
| - SetDirectMode();
|
| SetMemoryOnlyMode();
|
| SetMaxSize(100 * 1024);
|
| InitCache();
|
| @@ -1210,7 +1194,6 @@ TEST_F(DiskCacheEntryTest, InvalidData) {
|
| }
|
|
|
| TEST_F(DiskCacheEntryTest, InvalidDataNoBuffer) {
|
| - SetDirectMode();
|
| InitCache();
|
| cache_impl_->SetFlags(disk_cache::kNoBuffering);
|
| InvalidData();
|
| @@ -1277,7 +1260,6 @@ void DiskCacheEntryTest::DoomNormalEntry() {
|
| }
|
|
|
| TEST_F(DiskCacheEntryTest, DoomEntry) {
|
| - SetDirectMode();
|
| InitCache();
|
| DoomNormalEntry();
|
| }
|
| @@ -1359,7 +1341,6 @@ void DiskCacheEntryTest::DoomedEntry() {
|
| }
|
|
|
| TEST_F(DiskCacheEntryTest, DoomedEntry) {
|
| - SetDirectMode();
|
| InitCache();
|
| DoomedEntry();
|
| }
|
| @@ -1372,7 +1353,6 @@ TEST_F(DiskCacheEntryTest, MemoryOnlyDoomedEntry) {
|
|
|
| // Tests that we discard entries if the data is missing.
|
| TEST_F(DiskCacheEntryTest, MissingData) {
|
| - SetDirectMode();
|
| InitCache();
|
|
|
| std::string key("the first key");
|
| @@ -1778,7 +1758,6 @@ void DiskCacheEntryTest::UpdateSparseEntry() {
|
| }
|
|
|
| TEST_F(DiskCacheEntryTest, UpdateSparseEntry) {
|
| - SetDirectMode();
|
| SetCacheType(net::MEDIA_CACHE);
|
| InitCache();
|
| UpdateSparseEntry();
|
| @@ -1849,7 +1828,6 @@ void DiskCacheEntryTest::DoomSparseEntry() {
|
| }
|
|
|
| TEST_F(DiskCacheEntryTest, DoomSparseEntry) {
|
| - SetDirectMode();
|
| UseCurrentThread();
|
| InitCache();
|
| DoomSparseEntry();
|
| @@ -1884,7 +1862,6 @@ class SparseTestCompletionCallback: public net::TestCompletionCallback {
|
| // Tests that we don't crash when the backend is deleted while we are working
|
| // deleting the sub-entries of a sparse entry.
|
| TEST_F(DiskCacheEntryTest, DoomSparseEntry2) {
|
| - SetDirectMode();
|
| UseCurrentThread();
|
| InitCache();
|
| std::string key("the key");
|
|
|