Index: net/disk_cache/backend_unittest.cc |
diff --git a/net/disk_cache/backend_unittest.cc b/net/disk_cache/backend_unittest.cc |
index 77b6f7ce9f3814241c6936eb549ae861f1a4f6eb..5282bf567acf7dfa9257e98073ea9c29689c1cb8 100644 |
--- a/net/disk_cache/backend_unittest.cc |
+++ b/net/disk_cache/backend_unittest.cc |
@@ -3753,6 +3753,8 @@ TEST_F(DiskCacheBackendTest, SimpleCacheEnumerationWhileDoomed) { |
EXPECT_TRUE(keys_to_match.empty()); |
} |
+// This test is flaky on Android Marshmallow crbug.com/638891. |
+#if !defined(OS_ANDROID) |
// Tests that enumerations are not affected by corrupt files. |
TEST_F(DiskCacheBackendTest, SimpleCacheEnumerationCorruption) { |
SetSimpleCacheMode(); |
@@ -3790,6 +3792,7 @@ TEST_F(DiskCacheBackendTest, SimpleCacheEnumerationCorruption) { |
EXPECT_EQ(key_pool.size(), count); |
EXPECT_TRUE(keys_to_match.empty()); |
} |
+#endif |
// Tests that enumerations don't leak memory when the backend is destructed |
// mid-enumeration. |