1 files changed, 8 insertions, 1 deletions
diff --git a/webkit/fileapi/syncable/local_file_sync_context_unittest.cc b/webkit/fileapi/syncable/local_file_sync_context_unittest.cc
index a2f83ee..575493b 100644
--- a/webkit/fileapi/syncable/local_file_sync_context_unittest.cc
+++ b/webkit/fileapi/syncable/local_file_sync_context_unittest.cc
@@ -332,7 +332,14 @@ TEST_F(LocalFileSyncContextTest, MultipleFileSystemContexts) {
   file_system2.TearDown();
 }
 
-TEST_F(LocalFileSyncContextTest, PrepareSyncWhileWriting) {
+// LocalFileSyncContextTest.PrepareSyncWhileWriting is flaky on android.
+// http://crbug.com/239793
+#if define(OS_ANDROID)
+#define MAYBE_PrepareSyncWhileWriting DISABLED_PrepareSyncWhileWriting
+#else
+#define MAYBE_PrepareSyncWhileWriting PrepareSyncWhileWriting
+#endif
+TEST_F(LocalFileSyncContextTest, MAYBE_PrepareSyncWhileWriting) {
   CannedSyncableFileSystem file_system(GURL(kOrigin1), kServiceName,
                                        io_task_runner_, file_task_runner_);
   file_system.SetUp();