| Index: net/base/expiring_cache_unittest.cc
|
| diff --git a/net/base/expiring_cache_unittest.cc b/net/base/expiring_cache_unittest.cc
|
| index 74b069dd8d826da1ef7f22e2161ac52e45c8e988..f1414f90656420cb8850f02c842fe9246ed28424 100644
|
| --- a/net/base/expiring_cache_unittest.cc
|
| +++ b/net/base/expiring_cache_unittest.cc
|
| @@ -119,16 +119,16 @@ TEST(ExpiringCacheTest, Compact) {
|
| }
|
| EXPECT_EQ(10U, cache.size());
|
|
|
| - EXPECT_TRUE(ContainsKey(cache.entries_, "valid0"));
|
| - EXPECT_TRUE(ContainsKey(cache.entries_, "valid1"));
|
| - EXPECT_TRUE(ContainsKey(cache.entries_, "valid2"));
|
| - EXPECT_TRUE(ContainsKey(cache.entries_, "valid3"));
|
| - EXPECT_TRUE(ContainsKey(cache.entries_, "valid4"));
|
| - EXPECT_TRUE(ContainsKey(cache.entries_, "expired0"));
|
| - EXPECT_TRUE(ContainsKey(cache.entries_, "expired1"));
|
| - EXPECT_TRUE(ContainsKey(cache.entries_, "expired2"));
|
| - EXPECT_TRUE(ContainsKey(cache.entries_, "negative0"));
|
| - EXPECT_TRUE(ContainsKey(cache.entries_, "negative1"));
|
| + EXPECT_TRUE(base::ContainsKey(cache.entries_, "valid0"));
|
| + EXPECT_TRUE(base::ContainsKey(cache.entries_, "valid1"));
|
| + EXPECT_TRUE(base::ContainsKey(cache.entries_, "valid2"));
|
| + EXPECT_TRUE(base::ContainsKey(cache.entries_, "valid3"));
|
| + EXPECT_TRUE(base::ContainsKey(cache.entries_, "valid4"));
|
| + EXPECT_TRUE(base::ContainsKey(cache.entries_, "expired0"));
|
| + EXPECT_TRUE(base::ContainsKey(cache.entries_, "expired1"));
|
| + EXPECT_TRUE(base::ContainsKey(cache.entries_, "expired2"));
|
| + EXPECT_TRUE(base::ContainsKey(cache.entries_, "negative0"));
|
| + EXPECT_TRUE(base::ContainsKey(cache.entries_, "negative1"));
|
|
|
| // Shrink the new max constraints bound and compact. The "negative" and
|
| // "expired" entries should be dropped.
|
| @@ -136,16 +136,16 @@ TEST(ExpiringCacheTest, Compact) {
|
| cache.Compact(now);
|
| EXPECT_EQ(5U, cache.size());
|
|
|
| - EXPECT_TRUE(ContainsKey(cache.entries_, "valid0"));
|
| - EXPECT_TRUE(ContainsKey(cache.entries_, "valid1"));
|
| - EXPECT_TRUE(ContainsKey(cache.entries_, "valid2"));
|
| - EXPECT_TRUE(ContainsKey(cache.entries_, "valid3"));
|
| - EXPECT_TRUE(ContainsKey(cache.entries_, "valid4"));
|
| - EXPECT_FALSE(ContainsKey(cache.entries_, "expired0"));
|
| - EXPECT_FALSE(ContainsKey(cache.entries_, "expired1"));
|
| - EXPECT_FALSE(ContainsKey(cache.entries_, "expired2"));
|
| - EXPECT_FALSE(ContainsKey(cache.entries_, "negative0"));
|
| - EXPECT_FALSE(ContainsKey(cache.entries_, "negative1"));
|
| + EXPECT_TRUE(base::ContainsKey(cache.entries_, "valid0"));
|
| + EXPECT_TRUE(base::ContainsKey(cache.entries_, "valid1"));
|
| + EXPECT_TRUE(base::ContainsKey(cache.entries_, "valid2"));
|
| + EXPECT_TRUE(base::ContainsKey(cache.entries_, "valid3"));
|
| + EXPECT_TRUE(base::ContainsKey(cache.entries_, "valid4"));
|
| + EXPECT_FALSE(base::ContainsKey(cache.entries_, "expired0"));
|
| + EXPECT_FALSE(base::ContainsKey(cache.entries_, "expired1"));
|
| + EXPECT_FALSE(base::ContainsKey(cache.entries_, "expired2"));
|
| + EXPECT_FALSE(base::ContainsKey(cache.entries_, "negative0"));
|
| + EXPECT_FALSE(base::ContainsKey(cache.entries_, "negative1"));
|
|
|
| // Shrink further -- this time the compact will start dropping valid entries
|
| // to make space.
|
|
|