| OLD | NEW | 
|---|
| 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 1 // Copyright (c) 2012 The Chromium Authors. All rights reserved. | 
| 2 // Use of this source code is governed by a BSD-style license that can be | 2 // Use of this source code is governed by a BSD-style license that can be | 
| 3 // found in the LICENSE file. | 3 // found in the LICENSE file. | 
| 4 | 4 | 
| 5 #include "base/basictypes.h" | 5 #include "base/basictypes.h" | 
| 6 #include "base/file_util.h" | 6 #include "base/file_util.h" | 
| 7 #include "base/metrics/field_trial.h" | 7 #include "base/metrics/field_trial.h" | 
| 8 #include "base/port.h" | 8 #include "base/port.h" | 
| 9 #include "base/strings/string_util.h" | 9 #include "base/strings/string_util.h" | 
| 10 #include "base/strings/stringprintf.h" | 10 #include "base/strings/stringprintf.h" | 
| (...skipping 1765 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 1776   BackendTransaction("remove_load3", 100, true); | 1776   BackendTransaction("remove_load3", 100, true); | 
| 1777   ASSERT_TRUE(success_) << "remove_load3"; | 1777   ASSERT_TRUE(success_) << "remove_load3"; | 
| 1778 | 1778 | 
| 1779   // This case cannot be reverted. | 1779   // This case cannot be reverted. | 
| 1780   BackendTransaction("remove_one4", 0, false); | 1780   BackendTransaction("remove_one4", 0, false); | 
| 1781   ASSERT_TRUE(success_) << "remove_one4"; | 1781   ASSERT_TRUE(success_) << "remove_one4"; | 
| 1782   BackendTransaction("remove_head4", 1, false); | 1782   BackendTransaction("remove_head4", 1, false); | 
| 1783   ASSERT_TRUE(success_) << "remove_head4"; | 1783   ASSERT_TRUE(success_) << "remove_head4"; | 
| 1784 } | 1784 } | 
| 1785 | 1785 | 
| 1786 TEST_F(DiskCacheBackendTest, RecoverRemove) { | 1786 #if defined(OS_WIN) | 
|  | 1787 // http://crbug.com/396392 | 
|  | 1788 #define MAYBE_RecoverRemove DISABLED_RecoverRemove | 
|  | 1789 #else | 
|  | 1790 #define MAYBE_RecoverRemove RecoverRemove | 
|  | 1791 #endif | 
|  | 1792 TEST_F(DiskCacheBackendTest, MAYBE_RecoverRemove) { | 
| 1787   BackendRecoverRemove(); | 1793   BackendRecoverRemove(); | 
| 1788 } | 1794 } | 
| 1789 | 1795 | 
| 1790 TEST_F(DiskCacheBackendTest, NewEvictionRecoverRemove) { | 1796 #if defined(OS_WIN) | 
|  | 1797 // http://crbug.com/396392 | 
|  | 1798 #define MAYBE_NewEvictionRecoverRemove DISABLED_NewEvictionRecoverRemove | 
|  | 1799 #else | 
|  | 1800 #define MAYBE_NewEvictionRecoverRemove NewEvictionRecoverRemove | 
|  | 1801 #endif | 
|  | 1802 TEST_F(DiskCacheBackendTest, MAYBE_NewEvictionRecoverRemove) { | 
| 1791   SetNewEviction(); | 1803   SetNewEviction(); | 
| 1792   BackendRecoverRemove(); | 1804   BackendRecoverRemove(); | 
| 1793 } | 1805 } | 
| 1794 | 1806 | 
| 1795 void DiskCacheBackendTest::BackendRecoverWithEviction() { | 1807 void DiskCacheBackendTest::BackendRecoverWithEviction() { | 
| 1796   success_ = false; | 1808   success_ = false; | 
| 1797   ASSERT_TRUE(CopyTestCache("insert_load1")); | 1809   ASSERT_TRUE(CopyTestCache("insert_load1")); | 
| 1798   DisableFirstCleanup(); | 1810   DisableFirstCleanup(); | 
| 1799 | 1811 | 
| 1800   SetMask(0xf); | 1812   SetMask(0xf); | 
| (...skipping 1699 matching lines...) Expand 10 before | Expand all | Expand 10 after  Loading... | 
| 3500   void* iter = NULL; | 3512   void* iter = NULL; | 
| 3501   size_t count = 0; | 3513   size_t count = 0; | 
| 3502   ASSERT_TRUE(EnumerateAndMatchKeys(-1, &iter, &keys_to_match, &count)); | 3514   ASSERT_TRUE(EnumerateAndMatchKeys(-1, &iter, &keys_to_match, &count)); | 
| 3503   cache_->EndEnumeration(&iter); | 3515   cache_->EndEnumeration(&iter); | 
| 3504 | 3516 | 
| 3505   EXPECT_EQ(key_pool.size(), count); | 3517   EXPECT_EQ(key_pool.size(), count); | 
| 3506   EXPECT_TRUE(keys_to_match.empty()); | 3518   EXPECT_TRUE(keys_to_match.empty()); | 
| 3507 } | 3519 } | 
| 3508 | 3520 | 
| 3509 #endif  // defined(OS_POSIX) | 3521 #endif  // defined(OS_POSIX) | 
| OLD | NEW | 
|---|