summaryrefslogtreecommitdiffstats
path: root/ppapi/tests/test_file_io.cc
diff options
context:
space:
mode:
authorbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-08 21:02:32 +0000
committerbrettw@chromium.org <brettw@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2011-12-08 21:02:32 +0000
commit4f95dd7ca9883879dc642c2f61cff2edad412b38 (patch)
tree48daa9a31f86f5029ebe4e33ca5255e3436cd596 /ppapi/tests/test_file_io.cc
parent7b0d86deed914f1dcf5d206259699b5f692c6d3c (diff)
downloadchromium_src-4f95dd7ca9883879dc642c2f61cff2edad412b38.zip
chromium_src-4f95dd7ca9883879dc642c2f61cff2edad412b38.tar.gz
chromium_src-4f95dd7ca9883879dc642c2f61cff2edad412b38.tar.bz2
Implement a proxy for Pepper FileIO.
This splits apart the old in-process implementation into a new object in shared_impl that does most of the general tracking. This alllows that code to be shared by the proxy. BUG=http://crbug.com/101154 Review URL: http://codereview.chromium.org/8764003 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@113656 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'ppapi/tests/test_file_io.cc')
-rw-r--r--ppapi/tests/test_file_io.cc37
1 files changed, 33 insertions, 4 deletions
diff --git a/ppapi/tests/test_file_io.cc b/ppapi/tests/test_file_io.cc
index b04c7e9..057fdef 100644
--- a/ppapi/tests/test_file_io.cc
+++ b/ppapi/tests/test_file_io.cc
@@ -903,6 +903,31 @@ std::string TestFileIO::TestNotAllowMixedReadWrite() {
if (rv_2 != PP_ERROR_INPROGRESS)
return ReportError("FileIO::Read", rv_2);
+ // Cannot query while the write is pending.
+ TestCompletionCallback callback_3(instance_->pp_instance(), force_async_);
+ PP_FileInfo info;
+ int32_t rv_3 = file_io.Query(&info, callback_3);
+ if (rv_3 == PP_OK_COMPLETIONPENDING)
+ rv_3 = callback_3.WaitForResult();
+ if (rv_3 != PP_ERROR_INPROGRESS)
+ return ReportError("FileIO::Query", rv_3);
+
+ // Cannot touch while the write is pending.
+ 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);
+
+ // Cannot set length while the write is pending.
+ TestCompletionCallback callback_5(instance_->pp_instance(), force_async_);
+ int32_t rv_5 = file_io.SetLength(123, callback_5);
+ if (rv_5 == PP_OK_COMPLETIONPENDING)
+ rv_5 = callback_5.WaitForResult();
+ if (rv_5 != PP_ERROR_INPROGRESS)
+ return ReportError("FileIO::SetLength", rv_5);
+
callback_1.WaitForResult();
PASS();
@@ -940,10 +965,14 @@ std::string TestFileIO::TestWillWriteWillSetLength() {
if (!trusted)
return ReportError("FileIOTrusted", PP_ERROR_FAILED);
- // Get file descriptor.
- int32_t fd = trusted->GetOSFileDescriptor(file_io.pp_resource());
- if (fd < 0)
- return "FileIO::GetOSFileDescriptor() returned a bad file descriptor.";
+ // Get file descriptor. This is only supported in-process for now, so don't
+ // test out of process.
+ const PPB_Testing_Dev* testing_interface = GetTestingInterface();
+ if (testing_interface && !testing_interface->IsOutOfProcess()) {
+ int32_t fd = trusted->GetOSFileDescriptor(file_io.pp_resource());
+ if (fd < 0)
+ return "FileIO::GetOSFileDescriptor() returned a bad file descriptor.";
+ }
// Calling WillWrite.
rv = trusted->WillWrite(