Index: base/files/file_proxy_unittest.cc |
diff --git a/base/files/file_proxy_unittest.cc b/base/files/file_proxy_unittest.cc |
index df0bbc869c2d9a31a0113cf18d9b0961b8f35bae..efe5c92429986b8934df58ec9a712060d2fbb6a9 100644 |
--- a/base/files/file_proxy_unittest.cc |
+++ b/base/files/file_proxy_unittest.cc |
@@ -287,7 +287,13 @@ TEST_F(FileProxyTest, WriteAndFlush) { |
} |
} |
-TEST_F(FileProxyTest, SetTimes) { |
+#if defined(OS_ANDROID) |
+// Flaky on Android, see http://crbug.com/489602 |
+#define MAYBE_SetTimes DISABLED_SetTimes |
+#else |
+#define MAYBE_SetTimes SetTimes |
+#endif |
+TEST_F(FileProxyTest, MAYBE_SetTimes) { |
FileProxy proxy(file_task_runner()); |
CreateProxy( |
File::FLAG_CREATE | File::FLAG_WRITE | File::FLAG_WRITE_ATTRIBUTES, |