Fix flaky PPAPITest.FileIO_NotAllowMixedReadWrite, re-enable

ppapi/tests/test_file_io.cc

Index: ppapi/tests/test_file_io.cc
diff --git a/ppapi/tests/test_file_io.cc b/ppapi/tests/test_file_io.cc
index f5235e13d2f3537a7386b09882d7909bffe3c36c..0d69d19cdedb1c680415e72798f1f0dc7210f85d 100644
--- a/ppapi/tests/test_file_io.cc
+++ b/ppapi/tests/test_file_io.cc
@@ -902,8 +902,10 @@ std::string TestFileIO::TestNotAllowMixedReadWrite() {
     rv_2 = callback_2.WaitForResult();
   if (rv_2 != PP_ERROR_INPROGRESS)
     return ReportError("FileIO::Read", rv_2);
+  callback_1.WaitForResult();
 
-  // Cannot query while the write is pending.
+  // Cannot query while a write is pending.
+  rv_1 = file_io.Write(write_offset_1, buf_1, strlen(buf_1), callback_1);
   TestCompletionCallback callback_3(instance_->pp_instance(), force_async_);

[viettrungluu, 2012/06/25 21:41:34]

(Here and elsewhere:) I suppose you should |ASSERT_EQ(PP_OK_COMPLETIONPENDING,
rv_1);| or something.

[dmichael (off chromium), 2012/06/25 22:06:28]

Done.

   PP_FileInfo info;
   int32_t rv_3 = file_io.Query(&info, callback_3);
@@ -911,16 +913,20 @@ std::string TestFileIO::TestNotAllowMixedReadWrite() {
     rv_3 = callback_3.WaitForResult();
   if (rv_3 != PP_ERROR_INPROGRESS)
     return ReportError("FileIO::Query", rv_3);
+  callback_1.WaitForResult();
 
-  // Cannot touch while the write is pending.
+  // Cannot touch while a write is pending.
+  rv_1 = file_io.Write(write_offset_1, buf_1, strlen(buf_1), callback_1);
   TestCompletionCallback callback_4(instance_->pp_instance(), force_async_);
   int32_t rv_4 = file_io.Touch(1234.0, 5678.0, callback_4);
   if (rv_4 == PP_OK_COMPLETIONPENDING)
     rv_4 = callback_4.WaitForResult();
   if (rv_4 != PP_ERROR_INPROGRESS)
     return ReportError("FileIO::Touch", rv_4);
+  callback_1.WaitForResult();
 
-  // Cannot set length while the write is pending.
+  // Cannot set length while a write is pending.
+  rv_1 = file_io.Write(write_offset_1, buf_1, strlen(buf_1), callback_1);
   TestCompletionCallback callback_5(instance_->pp_instance(), force_async_);
   int32_t rv_5 = file_io.SetLength(123, callback_5);
   if (rv_5 == PP_OK_COMPLETIONPENDING)