summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorteravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-15 11:06:23 +0000
committerteravest@chromium.org <teravest@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>2013-03-15 11:06:23 +0000
commit599aeffdcddcd73fc4dff854631016438fd922c2 (patch)
tree94d4f0b041368f7af5e92e7a0c2720274e910481
parent9ffbb3ffc9220cd90e9aeaeb901963e1ba4922cc (diff)
downloadchromium_src-599aeffdcddcd73fc4dff854631016438fd922c2.zip
chromium_src-599aeffdcddcd73fc4dff854631016438fd922c2.tar.gz
chromium_src-599aeffdcddcd73fc4dff854631016438fd922c2.tar.bz2
Cleanup: Remove operator from TestCompletionCallback.
This change removes TestCompletionCallback::operator pp::CompletionCallback(), which made test code confusing to read, and allowed some strange static_cast<> hacks in tests. I tested this change by building ppapi_tests, browser_tests, and chrome. BUG= Review URL: https://chromiumcodereview.appspot.com/12824010 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@188334 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat
-rw-r--r--ppapi/tests/test_audio.cc12
-rw-r--r--ppapi/tests/test_directory_reader.cc12
-rw-r--r--ppapi/tests/test_file_io.cc145
-rw-r--r--ppapi/tests/test_file_ref.cc81
-rw-r--r--ppapi/tests/test_file_system.cc12
-rw-r--r--ppapi/tests/test_graphics_2d.cc2
-rw-r--r--ppapi/tests/test_graphics_3d.cc2
-rw-r--r--ppapi/tests/test_host_resolver_private.cc10
-rw-r--r--ppapi/tests/test_host_resolver_private_disallowed.cc3
-rw-r--r--ppapi/tests/test_mouse_lock.cc4
-rw-r--r--ppapi/tests/test_net_address_private_untrusted.cc2
-rw-r--r--ppapi/tests/test_tcp_server_socket_private.cc17
-rw-r--r--ppapi/tests/test_tcp_server_socket_private_disallowed.cc3
-rw-r--r--ppapi/tests/test_tcp_socket_private.cc26
-rw-r--r--ppapi/tests/test_tcp_socket_private_disallowed.cc2
-rw-r--r--ppapi/tests/test_tcp_socket_private_trusted.cc4
-rw-r--r--ppapi/tests/test_udp_socket_private.cc10
-rw-r--r--ppapi/tests/test_udp_socket_private_disallowed.cc2
-rw-r--r--ppapi/tests/test_url_loader.cc36
-rw-r--r--ppapi/tests/test_utils.h3
-rw-r--r--ppapi/tests/test_websocket.cc12
21 files changed, 209 insertions, 191 deletions
diff --git a/ppapi/tests/test_audio.cc b/ppapi/tests/test_audio.cc
index 0f70156..a85e955 100644
--- a/ppapi/tests/test_audio.cc
+++ b/ppapi/tests/test_audio.cc
@@ -215,8 +215,7 @@ std::string TestAudio::TestAudioCallback1() {
// |AudioCallbackTest()| calls |test_callback_|, sleeps a bit, then sets
// |test_done_|.
TestCompletionCallback test_callback(instance_->pp_instance());
- test_callback_ = static_cast<pp::CompletionCallback>(
- test_callback).pp_completion_callback();
+ test_callback_ = test_callback.GetCallback().pp_completion_callback();
test_done_ = false;
callback_fired_ = false;
@@ -262,8 +261,7 @@ std::string TestAudio::TestAudioCallback2() {
// |AudioCallbackTest()| calls |test_callback_|, sleeps a bit, then sets
// |test_done_|.
TestCompletionCallback test_callback(instance_->pp_instance());
- test_callback_ = static_cast<pp::CompletionCallback>(
- test_callback).pp_completion_callback();
+ test_callback_ = test_callback.GetCallback().pp_completion_callback();
test_done_ = false;
callback_fired_ = false;
@@ -308,8 +306,7 @@ std::string TestAudio::TestAudioCallback3() {
// |AudioCallbackTest()| calls |test_callback_|, sleeps a bit, then sets
// |test_done_|.
TestCompletionCallback test_callback_1(instance_->pp_instance());
- test_callback_ = static_cast<pp::CompletionCallback>(
- test_callback_1).pp_completion_callback();
+ test_callback_ = test_callback_1.GetCallback().pp_completion_callback();
test_done_ = false;
callback_fired_ = false;
@@ -326,8 +323,7 @@ std::string TestAudio::TestAudioCallback3() {
ASSERT_TRUE(callback_fired_);
TestCompletionCallback test_callback_2(instance_->pp_instance());
- test_callback_ = static_cast<pp::CompletionCallback>(
- test_callback_2).pp_completion_callback();
+ test_callback_ = test_callback_2.GetCallback().pp_completion_callback();
// Repeat one more |StartPlayback| & |StopPlayback| cycle, and verify again
// that the callback function was invoked.
diff --git a/ppapi/tests/test_directory_reader.cc b/ppapi/tests/test_directory_reader.cc
index 6f23bcaf..f577b12 100644
--- a/ppapi/tests/test_directory_reader.cc
+++ b/ppapi/tests/test_directory_reader.cc
@@ -66,14 +66,14 @@ int32_t TestDirectoryReader::DeleteDirectoryRecursively(pp::FileRef* dir) {
if (rv != PP_OK && rv != PP_ERROR_FILENOTFOUND)
return rv;
} else {
- rv = file_ref.Delete(callback);
+ rv = file_ref.Delete(callback.GetCallback());
if (rv == PP_OK_COMPLETIONPENDING)
rv = callback.WaitForResult();
if (rv != PP_OK && rv != PP_ERROR_FILENOTFOUND)
return rv;
}
}
- rv = dir->Delete(callback);
+ rv = dir->Delete(callback.GetCallback());
if (rv == PP_OK_COMPLETIONPENDING)
rv = callback.WaitForResult();
return rv;
@@ -83,7 +83,7 @@ std::string TestDirectoryReader::TestReadEntries() {
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
pp::FileSystem file_system(
instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
- int32_t rv = file_system.Open(1024, callback);
+ int32_t rv = file_system.Open(1024, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileSystem::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -101,7 +101,7 @@ std::string TestDirectoryReader::TestReadEntries() {
if (rv != PP_OK && rv != PP_ERROR_FILENOTFOUND)
return ReportError("DeleteDirectoryRecursively", rv);
- rv = test_dir.MakeDirectory(callback);
+ rv = test_dir.MakeDirectory(callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileRef::MakeDirectory force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -116,7 +116,7 @@ std::string TestDirectoryReader::TestReadEntries() {
pp::FileRef file_ref(file_system, buffer);
pp::FileIO file_io(instance_);
- rv = file_io.Open(file_ref, PP_FILEOPENFLAG_CREATE, callback);
+ rv = file_io.Open(file_ref, PP_FILEOPENFLAG_CREATE, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -133,7 +133,7 @@ std::string TestDirectoryReader::TestReadEntries() {
sprintf(buffer, "%s/%s%d", test_dir_name, dir_prefix, i);
pp::FileRef file_ref(file_system, buffer);
- rv = file_ref.MakeDirectory(callback);
+ rv = file_ref.MakeDirectory(callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileRef::MakeDirectory force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
diff --git a/ppapi/tests/test_file_io.cc b/ppapi/tests/test_file_io.cc
index e85bd55..ea9224f 100644
--- a/ppapi/tests/test_file_io.cc
+++ b/ppapi/tests/test_file_io.cc
@@ -68,7 +68,8 @@ int32_t ReadEntireFile(PP_Instance instance,
int32_t read_offset = offset;
for (;;) {
- int32_t rv = file_io->Read(read_offset, buf, sizeof(buf), callback);
+ int32_t rv = file_io->Read(read_offset, buf, sizeof(buf),
+ callback.GetCallback());
if (rv == PP_OK_COMPLETIONPENDING)
rv = callback.WaitForResult();
if (rv < 0)
@@ -116,7 +117,8 @@ int32_t WriteEntireBuffer(PP_Instance instance,
while (write_offset < offset + size) {
int32_t rv = file_io->Write(write_offset, &buf[write_offset - offset],
- size - write_offset + offset, callback);
+ size - write_offset + offset,
+ callback.GetCallback());
if (rv == PP_OK_COMPLETIONPENDING)
rv = callback.WaitForResult();
if (rv < 0)
@@ -157,7 +159,7 @@ std::string TestFileIO::TestOpen() {
pp::FileSystem file_system(instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
pp::FileRef file_ref(file_system, "/file_open");
- int32_t rv = file_system.Open(1024, callback);
+ int32_t rv = file_system.Open(1024, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileSystem::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -254,7 +256,7 @@ std::string TestFileIO::TestOpenDirectory() {
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
pp::FileSystem file_system(instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
- int32_t rv = file_system.Open(1024, callback);
+ int32_t rv = file_system.Open(1024, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileSystem::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -264,7 +266,7 @@ std::string TestFileIO::TestOpenDirectory() {
// Make a directory.
pp::FileRef dir_ref(file_system, "/test_dir_open_directory");
- rv = dir_ref.MakeDirectory(callback);
+ rv = dir_ref.MakeDirectory(callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileSystem::MakeDirectory force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -275,7 +277,7 @@ std::string TestFileIO::TestOpenDirectory() {
// Open the directory. This is expected to fail since directories cannot be
// opened.
pp::FileIO file_io(instance_);
- rv = file_io.Open(dir_ref, PP_FILEOPENFLAG_READ, callback);
+ rv = file_io.Open(dir_ref, PP_FILEOPENFLAG_READ, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -292,7 +294,7 @@ std::string TestFileIO::TestReadWriteSetLength() {
pp::FileSystem file_system(instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
pp::FileRef file_ref(file_system, "/file_read_write_setlength");
- int32_t rv = file_system.Open(1024, callback);
+ int32_t rv = file_system.Open(1024, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileSystem::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -306,7 +308,7 @@ std::string TestFileIO::TestReadWriteSetLength() {
PP_FILEOPENFLAG_TRUNCATE |
PP_FILEOPENFLAG_READ |
PP_FILEOPENFLAG_WRITE,
- callback);
+ callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -322,7 +324,7 @@ std::string TestFileIO::TestReadWriteSetLength() {
// Check for failing read operation.
char buf[256];
rv = file_io.Read(0, buf, -1, // negative number of bytes to read
- callback);
+ callback.GetCallback());
if (rv == PP_OK_COMPLETIONPENDING)
rv = callback.WaitForResult();
if (rv != PP_ERROR_FAILED)
@@ -337,7 +339,7 @@ std::string TestFileIO::TestReadWriteSetLength() {
return ReportMismatch("FileIO::Read", read_buffer, "test_test");
// Truncate the file.
- rv = file_io.SetLength(4, callback);
+ rv = file_io.SetLength(4, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::SetLength force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -376,7 +378,7 @@ std::string TestFileIO::TestReadWriteSetLength() {
std::string("test\0\0\0\0test", 12));
// Extend the file.
- rv = file_io.SetLength(16, callback);
+ rv = file_io.SetLength(16, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::SetLength force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -427,7 +429,7 @@ std::string TestFileIO::TestReadToArrayWriteSetLength() {
pp::FileSystem file_system(instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
pp::FileRef file_ref(file_system, "/file_read_write_setlength");
- int32_t rv = file_system.Open(1024, callback);
+ int32_t rv = file_system.Open(1024, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileSystem::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -441,7 +443,7 @@ std::string TestFileIO::TestReadToArrayWriteSetLength() {
PP_FILEOPENFLAG_TRUNCATE |
PP_FILEOPENFLAG_READ |
PP_FILEOPENFLAG_WRITE,
- callback);
+ callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -475,7 +477,7 @@ std::string TestFileIO::TestReadToArrayWriteSetLength() {
return ReportMismatch("FileIO::Read", read_buffer, "test_test");
// Truncate the file.
- rv = file_io.SetLength(4, callback);
+ rv = file_io.SetLength(4, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::SetLength force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -517,7 +519,7 @@ std::string TestFileIO::TestReadToArrayWriteSetLength() {
std::string("test\0\0\0\0test", 12));
// Extend the file.
- rv = file_io.SetLength(16, callback);
+ rv = file_io.SetLength(16, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::SetLength force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -567,7 +569,7 @@ std::string TestFileIO::TestTouchQuery() {
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
pp::FileSystem file_system(instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
- int32_t rv = file_system.Open(1024, callback);
+ int32_t rv = file_system.Open(1024, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileSystem::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -581,7 +583,7 @@ std::string TestFileIO::TestTouchQuery() {
PP_FILEOPENFLAG_CREATE |
PP_FILEOPENFLAG_TRUNCATE |
PP_FILEOPENFLAG_WRITE,
- callback);
+ callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -590,7 +592,7 @@ std::string TestFileIO::TestTouchQuery() {
return ReportError("FileIO::Open", rv);
// Write some data to have a non-zero file size.
- rv = file_io.Write(0, "test", 4, callback);
+ rv = file_io.Write(0, "test", 4, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Write force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -602,7 +604,8 @@ std::string TestFileIO::TestTouchQuery() {
// last_modified_time's granularity is 2 seconds
const PP_Time last_access_time = 123 * 24 * 3600.0;
const PP_Time last_modified_time = 246.0;
- rv = file_io.Touch(last_access_time, last_modified_time, callback);
+ rv = file_io.Touch(last_access_time, last_modified_time,
+ callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Touch force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -611,7 +614,7 @@ std::string TestFileIO::TestTouchQuery() {
return ReportError("FileIO::Touch", rv);
PP_FileInfo info;
- rv = file_io.Query(&info, callback);
+ rv = file_io.Query(&info, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Query force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -627,7 +630,7 @@ std::string TestFileIO::TestTouchQuery() {
return "FileIO::Query() has returned bad data.";
// Call |Query()| again, to make sure it works a second time.
- rv = file_io.Query(&info, callback);
+ rv = file_io.Query(&info, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Query force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -643,7 +646,7 @@ std::string TestFileIO::TestAbortCalls() {
pp::FileSystem file_system(instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
pp::FileRef file_ref(file_system, "/file_abort_calls");
- int32_t rv = file_system.Open(1024, callback);
+ int32_t rv = file_system.Open(1024, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileSystem::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -656,7 +659,7 @@ std::string TestFileIO::TestAbortCalls() {
pp::FileIO file_io(instance_);
rv = file_io.Open(file_ref,
PP_FILEOPENFLAG_CREATE | PP_FILEOPENFLAG_WRITE,
- callback);
+ callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -676,8 +679,8 @@ std::string TestFileIO::TestAbortCalls() {
// Abort |Open()|.
{
callback.reset_run_count();
- rv = pp::FileIO(instance_)
- .Open(file_ref, PP_FILEOPENFLAG_READ,callback);
+ rv = pp::FileIO(instance_).Open(file_ref, PP_FILEOPENFLAG_READ,
+ callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Open force_async", rv);
if (callback.run_count() > 0)
@@ -696,7 +699,7 @@ std::string TestFileIO::TestAbortCalls() {
PP_FileInfo info = { 0 };
{
pp::FileIO file_io(instance_);
- rv = file_io.Open(file_ref, PP_FILEOPENFLAG_READ, callback);
+ rv = file_io.Open(file_ref, PP_FILEOPENFLAG_READ, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -705,7 +708,7 @@ std::string TestFileIO::TestAbortCalls() {
return ReportError("FileIO::Open", rv);
callback.reset_run_count();
- rv = file_io.Query(&info, callback);
+ rv = file_io.Query(&info, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Query force_async", rv);
} // Destroy |file_io|.
@@ -727,7 +730,8 @@ std::string TestFileIO::TestAbortCalls() {
{
{
pp::FileIO file_io(instance_);
- rv = file_io.Open(file_ref, PP_FILEOPENFLAG_WRITE, callback);
+ rv = file_io.Open(file_ref, PP_FILEOPENFLAG_WRITE,
+ callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -736,7 +740,7 @@ std::string TestFileIO::TestAbortCalls() {
return ReportError("FileIO::Open", rv);
callback.reset_run_count();
- rv = file_io.Touch(0, 0, callback);
+ rv = file_io.Touch(0, 0, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Touch force_async", rv);
} // Destroy |file_io|.
@@ -754,7 +758,7 @@ std::string TestFileIO::TestAbortCalls() {
char buf[3] = { 0 };
{
pp::FileIO file_io(instance_);
- rv = file_io.Open(file_ref, PP_FILEOPENFLAG_READ, callback);
+ rv = file_io.Open(file_ref, PP_FILEOPENFLAG_READ, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -763,7 +767,7 @@ std::string TestFileIO::TestAbortCalls() {
return ReportError("FileIO::Open", rv);
callback.reset_run_count();
- rv = file_io.Read(0, buf, sizeof(buf), callback);
+ rv = file_io.Read(0, buf, sizeof(buf), callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Read force_async", rv);
} // Destroy |file_io|.
@@ -786,7 +790,7 @@ std::string TestFileIO::TestAbortCalls() {
char buf[3] = { 0 };
{
pp::FileIO file_io(instance_);
- rv = file_io.Open(file_ref, PP_FILEOPENFLAG_READ, callback);
+ rv = file_io.Open(file_ref, PP_FILEOPENFLAG_READ, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -795,7 +799,7 @@ std::string TestFileIO::TestAbortCalls() {
return ReportError("FileIO::Open", rv);
callback.reset_run_count();
- rv = file_io.Write(0, buf, sizeof(buf), callback);
+ rv = file_io.Write(0, buf, sizeof(buf), callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Write force_async", rv);
} // Destroy |file_io|.
@@ -812,7 +816,7 @@ std::string TestFileIO::TestAbortCalls() {
{
{
pp::FileIO file_io(instance_);
- rv = file_io.Open(file_ref, PP_FILEOPENFLAG_READ, callback);
+ rv = file_io.Open(file_ref, PP_FILEOPENFLAG_READ, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -821,7 +825,7 @@ std::string TestFileIO::TestAbortCalls() {
return ReportError("FileIO::Open", rv);
callback.reset_run_count();
- rv = file_io.SetLength(3, callback);
+ rv = file_io.SetLength(3, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::SetLength force_async", rv);
} // Destroy |file_io|.
@@ -838,7 +842,7 @@ std::string TestFileIO::TestAbortCalls() {
{
{
pp::FileIO file_io(instance_);
- rv = file_io.Open(file_ref, PP_FILEOPENFLAG_READ, callback);
+ rv = file_io.Open(file_ref, PP_FILEOPENFLAG_READ, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -847,7 +851,7 @@ std::string TestFileIO::TestAbortCalls() {
return ReportError("FileIO::Open", rv);
callback.reset_run_count();
- rv = file_io.Flush(callback);
+ rv = file_io.Flush(callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Flush force_async", rv);
} // Destroy |file_io|.
@@ -870,7 +874,7 @@ std::string TestFileIO::TestParallelReads() {
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
pp::FileSystem file_system(instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
pp::FileRef file_ref(file_system, "/file_parallel_reads");
- int32_t rv = file_system.Open(1024, callback);
+ int32_t rv = file_system.Open(1024, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileSystem::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -884,7 +888,7 @@ std::string TestFileIO::TestParallelReads() {
PP_FILEOPENFLAG_TRUNCATE |
PP_FILEOPENFLAG_READ |
PP_FILEOPENFLAG_WRITE,
- callback);
+ callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -921,13 +925,15 @@ std::string TestFileIO::TestParallelReads() {
int32_t rv_2 = PP_OK;
while (size_1 >= 0 && size_2 >= 0 && size_1 + size_2 > 0) {
if (size_1 > 0) {
- rv_1 = file_io.Read(read_offset_1, buf_1, size_1, callback_1);
+ rv_1 = file_io.Read(read_offset_1, buf_1, size_1,
+ callback_1.GetCallback());
if (rv_1 != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Read", rv_1);
}
if (size_2 > 0) {
- rv_2 = file_io.Read(read_offset_2, buf_2, size_2, callback_2);
+ rv_2 = file_io.Read(read_offset_2, buf_2, size_2,
+ callback_2.GetCallback());
if (rv_2 != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Read", rv_2);
}
@@ -976,7 +982,7 @@ std::string TestFileIO::TestParallelWrites() {
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
pp::FileSystem file_system(instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
pp::FileRef file_ref(file_system, "/file_parallel_writes");
- int32_t rv = file_system.Open(1024, callback);
+ int32_t rv = file_system.Open(1024, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileSystem::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -990,7 +996,7 @@ std::string TestFileIO::TestParallelWrites() {
PP_FILEOPENFLAG_TRUNCATE |
PP_FILEOPENFLAG_READ |
PP_FILEOPENFLAG_WRITE,
- callback);
+ callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -1013,13 +1019,15 @@ std::string TestFileIO::TestParallelWrites() {
int32_t rv_2 = PP_OK;
while (size_1 >= 0 && size_2 >= 0 && size_1 + size_2 > 0) {
if (size_1 > 0) {
- rv_1 = file_io.Write(write_offset_1, buf_1, size_1, callback_1);
+ rv_1 = file_io.Write(write_offset_1, buf_1, size_1,
+ callback_1.GetCallback());
if (rv_1 != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Write", rv_1);
}
if (size_2 > 0) {
- rv_2 = file_io.Write(write_offset_2, buf_2, size_2, callback_2);
+ rv_2 = file_io.Write(write_offset_2, buf_2, size_2,
+ callback_2.GetCallback());
if (rv_2 != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Write", rv_2);
}
@@ -1066,7 +1074,7 @@ std::string TestFileIO::TestNotAllowMixedReadWrite() {
pp::FileSystem file_system(instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
pp::FileRef file_ref(file_system, "/file_not_allow_mixed_read_write");
- int32_t rv = file_system.Open(1024, callback);
+ int32_t rv = file_system.Open(1024, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileSystem::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -1080,7 +1088,7 @@ std::string TestFileIO::TestNotAllowMixedReadWrite() {
PP_FILEOPENFLAG_TRUNCATE |
PP_FILEOPENFLAG_READ |
PP_FILEOPENFLAG_WRITE,
- callback);
+ callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -1093,7 +1101,7 @@ std::string TestFileIO::TestNotAllowMixedReadWrite() {
int32_t write_offset_1 = 0;
const char* buf_1 = "mnopqrstuvw";
int32_t rv_1 = file_io.Write(write_offset_1, buf_1, strlen(buf_1),
- callback_1);
+ callback_1.GetCallback());
if (rv_1 != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Write", rv_1);
@@ -1101,7 +1109,7 @@ std::string TestFileIO::TestNotAllowMixedReadWrite() {
int32_t read_offset_2 = 4;
char buf_2[3];
int32_t rv_2 = file_io.Read(read_offset_2, buf_2, sizeof(buf_2),
- callback_2);
+ callback_2.GetCallback());
if (force_async_ && rv_2 != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Read force_async", rv_2);
if (rv_2 == PP_OK_COMPLETIONPENDING)
@@ -1111,11 +1119,12 @@ std::string TestFileIO::TestNotAllowMixedReadWrite() {
callback_1.WaitForResult();
// Cannot query while a write is pending.
- rv_1 = file_io.Write(write_offset_1, buf_1, strlen(buf_1), callback_1);
+ rv_1 = file_io.Write(write_offset_1, buf_1, strlen(buf_1),
+ callback_1.GetCallback());
ASSERT_EQ(PP_OK_COMPLETIONPENDING, rv_1);
TestCompletionCallback callback_3(instance_->pp_instance(), force_async_);
PP_FileInfo info;
- int32_t rv_3 = file_io.Query(&info, callback_3);
+ int32_t rv_3 = file_io.Query(&info, callback_3.GetCallback());
if (rv_3 == PP_OK_COMPLETIONPENDING)
rv_3 = callback_3.WaitForResult();
if (rv_3 != PP_ERROR_INPROGRESS)
@@ -1123,10 +1132,11 @@ std::string TestFileIO::TestNotAllowMixedReadWrite() {
callback_1.WaitForResult();
// Cannot touch while a write is pending.
- rv_1 = file_io.Write(write_offset_1, buf_1, strlen(buf_1), callback_1);
+ rv_1 = file_io.Write(write_offset_1, buf_1, strlen(buf_1),
+ callback_1.GetCallback());
ASSERT_EQ(PP_OK_COMPLETIONPENDING, rv_1);
TestCompletionCallback callback_4(instance_->pp_instance(), force_async_);
- int32_t rv_4 = file_io.Touch(1234.0, 5678.0, callback_4);
+ int32_t rv_4 = file_io.Touch(1234.0, 5678.0, callback_4.GetCallback());
if (rv_4 == PP_OK_COMPLETIONPENDING)
rv_4 = callback_4.WaitForResult();
if (rv_4 != PP_ERROR_INPROGRESS)
@@ -1134,10 +1144,11 @@ std::string TestFileIO::TestNotAllowMixedReadWrite() {
callback_1.WaitForResult();
// Cannot set length while a write is pending.
- rv_1 = file_io.Write(write_offset_1, buf_1, strlen(buf_1), callback_1);
+ rv_1 = file_io.Write(write_offset_1, buf_1, strlen(buf_1),
+ callback_1.GetCallback());
ASSERT_EQ(PP_OK_COMPLETIONPENDING, rv_1);
TestCompletionCallback callback_5(instance_->pp_instance(), force_async_);
- int32_t rv_5 = file_io.SetLength(123, callback_5);
+ int32_t rv_5 = file_io.SetLength(123, callback_5.GetCallback());
if (rv_5 == PP_OK_COMPLETIONPENDING)
rv_5 = callback_5.WaitForResult();
if (rv_5 != PP_ERROR_INPROGRESS)
@@ -1152,7 +1163,7 @@ std::string TestFileIO::TestWillWriteWillSetLength() {
pp::FileSystem file_system(instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
pp::FileRef file_ref(file_system, "/file_will_write");
- int32_t rv = file_system.Open(1024, callback);
+ int32_t rv = file_system.Open(1024, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileSystem::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -1166,7 +1177,7 @@ std::string TestFileIO::TestWillWriteWillSetLength() {
PP_FILEOPENFLAG_TRUNCATE |
PP_FILEOPENFLAG_READ |
PP_FILEOPENFLAG_WRITE,
- callback);
+ callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -1191,7 +1202,7 @@ std::string TestFileIO::TestWillWriteWillSetLength() {
// Calling WillWrite.
rv = trusted->WillWrite(
file_io.pp_resource(), 0, 9,
- static_cast<pp::CompletionCallback>(callback).pp_completion_callback());
+ callback.GetCallback().pp_completion_callback());
if (rv == PP_OK_COMPLETIONPENDING)
rv = callback.WaitForResult();
if (rv != 9)
@@ -1212,14 +1223,14 @@ std::string TestFileIO::TestWillWriteWillSetLength() {
// Calling WillSetLength.
rv = trusted->WillSetLength(
file_io.pp_resource(), 4,
- static_cast<pp::CompletionCallback>(callback).pp_completion_callback());
+ callback.GetCallback().pp_completion_callback());
if (rv == PP_OK_COMPLETIONPENDING)
rv = callback.WaitForResult();
if (rv != PP_OK)
return ReportError("WillSetLength", rv);
// Calling actual SetLength.
- rv = file_io.SetLength(4, callback);
+ rv = file_io.SetLength(4, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::SetLength force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -1267,7 +1278,7 @@ std::string TestFileIO::MatchOpenExpectations(pp::FileSystem* file_system,
// Setup files for test.
{
- int32_t rv = existent_file_ref.Delete(callback);
+ int32_t rv = existent_file_ref.Delete(callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileRef::Delete force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -1275,7 +1286,7 @@ std::string TestFileIO::MatchOpenExpectations(pp::FileSystem* file_system,
if (rv != PP_OK && rv != PP_ERROR_FILENOTFOUND)
return ReportError("FileRef::Delete", rv);
- rv = nonexistent_file_ref.Delete(callback);
+ rv = nonexistent_file_ref.Delete(callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileRef::Delete force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -1286,7 +1297,7 @@ std::string TestFileIO::MatchOpenExpectations(pp::FileSystem* file_system,
pp::FileIO existent_file_io(instance_);
rv = existent_file_io.Open(existent_file_ref,
PP_FILEOPENFLAG_CREATE | PP_FILEOPENFLAG_WRITE,
- callback);
+ callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -1301,7 +1312,8 @@ std::string TestFileIO::MatchOpenExpectations(pp::FileSystem* file_system,
}
pp::FileIO existent_file_io(instance_);
- int32_t rv = existent_file_io.Open(existent_file_ref, open_flags, callback);
+ int32_t rv = existent_file_io.Open(existent_file_ref, open_flags,
+ callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -1313,7 +1325,7 @@ std::string TestFileIO::MatchOpenExpectations(pp::FileSystem* file_system,
if (!invalid_combination && open_if_exists) {
PP_FileInfo info;
- rv = existent_file_io.Query(&info, callback);
+ rv = existent_file_io.Query(&info, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Query force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -1326,7 +1338,8 @@ std::string TestFileIO::MatchOpenExpectations(pp::FileSystem* file_system,
}
pp::FileIO nonexistent_file_io(instance_);
- rv = nonexistent_file_io.Open(nonexistent_file_ref, open_flags, callback);
+ rv = nonexistent_file_io.Open(nonexistent_file_ref, open_flags,
+ callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
diff --git a/ppapi/tests/test_file_ref.cc b/ppapi/tests/test_file_ref.cc
index 09260120..3c91f18 100644
--- a/ppapi/tests/test_file_ref.cc
+++ b/ppapi/tests/test_file_ref.cc
@@ -115,7 +115,7 @@ std::string TestFileRef::TestGetFileSystemType() {
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
pp::URLLoader loader(instance_);
- int32_t rv = loader.Open(request, callback);
+ int32_t rv = loader.Open(request, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("URLLoader::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -166,7 +166,7 @@ std::string TestFileRef::TestGetName() {
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
pp::URLLoader loader(instance_);
- int32_t rv = loader.Open(request, callback);
+ int32_t rv = loader.Open(request, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("URLLoader::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -212,7 +212,7 @@ std::string TestFileRef::TestGetPath() {
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
pp::URLLoader loader(instance_);
- int32_t rv = loader.Open(request, callback);
+ int32_t rv = loader.Open(request, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("URLLoader::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -269,7 +269,7 @@ std::string TestFileRef::TestGetParent() {
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
pp::URLLoader loader(instance_);
- int32_t rv = loader.Open(request, callback);
+ int32_t rv = loader.Open(request, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("URLLoader::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -296,7 +296,7 @@ std::string TestFileRef::TestMakeDirectory() {
// Open.
pp::FileSystem file_system(instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
- int32_t rv = file_system.Open(1024, callback);
+ int32_t rv = file_system.Open(1024, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileSystem::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -306,7 +306,7 @@ std::string TestFileRef::TestMakeDirectory() {
// MakeDirectory.
pp::FileRef dir_ref(file_system, "/test_dir_make_directory");
- rv = dir_ref.MakeDirectory(callback);
+ rv = dir_ref.MakeDirectory(callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileSystem::MakeDirectory force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -317,7 +317,7 @@ std::string TestFileRef::TestMakeDirectory() {
// MakeDirectory aborted.
callback.reset_run_count();
rv = pp::FileRef(file_system, "/test_dir_make_abort")
- .MakeDirectory(callback);
+ .MakeDirectory(callback.GetCallback());
if (callback.run_count() > 0)
return "FileSystem::MakeDirectory ran callback synchronously.";
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
@@ -332,7 +332,7 @@ std::string TestFileRef::TestMakeDirectory() {
// MakeDirectoryIncludingAncestors.
dir_ref = pp::FileRef(file_system, "/dir_make_dir_1/dir_make_dir_2");
- rv = dir_ref.MakeDirectoryIncludingAncestors(callback);
+ rv = dir_ref.MakeDirectoryIncludingAncestors(callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileSystem::MakeDirectory force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -343,7 +343,7 @@ std::string TestFileRef::TestMakeDirectory() {
// MakeDirectoryIncludingAncestors aborted.
callback.reset_run_count();
rv = pp::FileRef(file_system, "/dir_make_abort_1/dir_make_abort_2")
- .MakeDirectoryIncludingAncestors(callback);
+ .MakeDirectoryIncludingAncestors(callback.GetCallback());
if (callback.run_count() > 0) {
return "FileSystem::MakeDirectoryIncludingAncestors "
"ran callback synchronously.";
@@ -361,7 +361,7 @@ std::string TestFileRef::TestMakeDirectory() {
// MakeDirectory with nested path.
dir_ref = pp::FileRef(file_system, "/dir_make_dir_3/dir_make_dir_4");
- rv = dir_ref.MakeDirectory(callback);
+ rv = dir_ref.MakeDirectory(callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileSystem::MakeDirectory force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -377,7 +377,7 @@ std::string TestFileRef::TestMakeDirectory() {
std::string TestFileRef::TestQueryAndTouchFile() {
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
pp::FileSystem file_system(instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
- int32_t rv = file_system.Open(1024, callback);
+ int32_t rv = file_system.Open(1024, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileSystem::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -391,7 +391,7 @@ std::string TestFileRef::TestQueryAndTouchFile() {
PP_FILEOPENFLAG_CREATE |
PP_FILEOPENFLAG_TRUNCATE |
PP_FILEOPENFLAG_WRITE,
- callback);
+ callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -400,7 +400,7 @@ std::string TestFileRef::TestQueryAndTouchFile() {
return ReportError("FileIO::Open", rv);
// Write some data to have a non-zero file size.
- rv = file_io.Write(0, "test", 4, callback);
+ rv = file_io.Write(0, "test", 4, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Write force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -413,7 +413,8 @@ std::string TestFileRef::TestQueryAndTouchFile() {
// last_modified_time's granularity is 2 seconds
const PP_Time last_access_time = 123 * 24 * 3600.0;
const PP_Time last_modified_time = 246.0;
- rv = file_ref.Touch(last_access_time, last_modified_time, callback);
+ rv = file_ref.Touch(last_access_time, last_modified_time,
+ callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileSystem::Touch force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -424,7 +425,7 @@ std::string TestFileRef::TestQueryAndTouchFile() {
// Touch aborted.
callback.reset_run_count();
rv = pp::FileRef(file_system, "/file_touch_abort")
- .Touch(last_access_time, last_modified_time, callback);
+ .Touch(last_access_time, last_modified_time, callback.GetCallback());
if (callback.run_count() > 0)
return "FileSystem::Touch ran callback synchronously.";
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
@@ -439,7 +440,7 @@ std::string TestFileRef::TestQueryAndTouchFile() {
// Query.
PP_FileInfo info;
- rv = file_io.Query(&info, callback);
+ rv = file_io.Query(&info, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileSystem::Query force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -459,7 +460,7 @@ std::string TestFileRef::TestQueryAndTouchFile() {
callback.reset_run_count();
// TODO(viettrungluu): check |info| for late writes.
rv = pp::FileRef(file_system, "/file_touch").Touch(
- last_access_time, last_modified_time, callback);
+ last_access_time, last_modified_time, callback.GetCallback());
if (callback.run_count() > 0)
return "FileSystem::Touch ran callback synchronously.";
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
@@ -478,7 +479,7 @@ std::string TestFileRef::TestQueryAndTouchFile() {
std::string TestFileRef::TestDeleteFileAndDirectory() {
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
pp::FileSystem file_system(instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
- int32_t rv = file_system.Open(1024, callback);
+ int32_t rv = file_system.Open(1024, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileSystem::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -488,7 +489,7 @@ std::string TestFileRef::TestDeleteFileAndDirectory() {
pp::FileRef file_ref(file_system, "/file_delete");
pp::FileIO file_io(instance_);
- rv = file_io.Open(file_ref, PP_FILEOPENFLAG_CREATE, callback);
+ rv = file_io.Open(file_ref, PP_FILEOPENFLAG_CREATE, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -496,7 +497,7 @@ std::string TestFileRef::TestDeleteFileAndDirectory() {
if (rv != PP_OK)
return ReportError("FileIO::Open", rv);
- rv = file_ref.Delete(callback);
+ rv = file_ref.Delete(callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileRef::Delete force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -505,7 +506,7 @@ std::string TestFileRef::TestDeleteFileAndDirectory() {
return ReportError("FileRef::Delete", rv);
pp::FileRef dir_ref(file_system, "/dir_delete");
- rv = dir_ref.MakeDirectory(callback);
+ rv = dir_ref.MakeDirectory(callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileRef::MakeDirectory force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -513,7 +514,7 @@ std::string TestFileRef::TestDeleteFileAndDirectory() {
if (rv != PP_OK)
return ReportError("FileRef::MakeDirectory", rv);
- rv = dir_ref.Delete(callback);
+ rv = dir_ref.Delete(callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileRef::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -522,7 +523,7 @@ std::string TestFileRef::TestDeleteFileAndDirectory() {
return ReportError("FileRef::Delete", rv);
pp::FileRef nested_dir_ref(file_system, "/dir_delete_1/dir_delete_2");
- rv = nested_dir_ref.MakeDirectoryIncludingAncestors(callback);
+ rv = nested_dir_ref.MakeDirectoryIncludingAncestors(callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileRef::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -532,7 +533,7 @@ std::string TestFileRef::TestDeleteFileAndDirectory() {
// Hang on to a ref to the parent; otherwise the callback will be aborted.
pp::FileRef parent_dir_ref = nested_dir_ref.GetParent();
- rv = parent_dir_ref.Delete(callback);
+ rv = parent_dir_ref.Delete(callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileRef::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -541,7 +542,7 @@ std::string TestFileRef::TestDeleteFileAndDirectory() {
return ReportError("FileRef::Delete", rv);
pp::FileRef nonexistent_file_ref(file_system, "/nonexistent_file_delete");
- rv = nonexistent_file_ref.Delete(callback);
+ rv = nonexistent_file_ref.Delete(callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileRef::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -553,7 +554,8 @@ std::string TestFileRef::TestDeleteFileAndDirectory() {
{
pp::FileRef file_ref_abort(file_system, "/file_delete_abort");
pp::FileIO file_io_abort(instance_);
- rv = file_io_abort.Open(file_ref_abort, PP_FILEOPENFLAG_CREATE, callback);
+ rv = file_io_abort.Open(file_ref_abort, PP_FILEOPENFLAG_CREATE,
+ callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -562,7 +564,7 @@ std::string TestFileRef::TestDeleteFileAndDirectory() {
return ReportError("FileIO::Open", rv);
callback.reset_run_count();
- rv = file_ref_abort.Delete(callback);
+ rv = file_ref_abort.Delete(callback.GetCallback());
}
if (callback.run_count() > 0)
return "FileRef::Delete ran callback synchronously.";
@@ -582,7 +584,7 @@ std::string TestFileRef::TestDeleteFileAndDirectory() {
std::string TestFileRef::TestRenameFileAndDirectory() {
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
pp::FileSystem file_system(instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
- int32_t rv = file_system.Open(1024, callback);
+ int32_t rv = file_system.Open(1024, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileSystem::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -592,7 +594,7 @@ std::string TestFileRef::TestRenameFileAndDirectory() {
pp::FileRef file_ref(file_system, "/file_rename");
pp::FileIO file_io(instance_);
- rv = file_io.Open(file_ref, PP_FILEOPENFLAG_CREATE, callback);
+ rv = file_io.Open(file_ref, PP_FILEOPENFLAG_CREATE, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -601,7 +603,7 @@ std::string TestFileRef::TestRenameFileAndDirectory() {
return ReportError("FileIO::Open", rv);
pp::FileRef target_file_ref(file_system, "/target_file_rename");
- rv = file_ref.Rename(target_file_ref, callback);
+ rv = file_ref.Rename(target_file_ref, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileRef::Rename force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -610,7 +612,7 @@ std::string TestFileRef::TestRenameFileAndDirectory() {
return ReportError("FileRef::Rename", rv);
pp::FileRef dir_ref(file_system, "/dir_rename");
- rv = dir_ref.MakeDirectory(callback);
+ rv = dir_ref.MakeDirectory(callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileRef::MakeDirectory force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -619,7 +621,7 @@ std::string TestFileRef::TestRenameFileAndDirectory() {
return ReportError("FileRef::MakeDirectory", rv);
pp::FileRef target_dir_ref(file_system, "/target_dir_rename");
- rv = dir_ref.Rename(target_dir_ref, callback);
+ rv = dir_ref.Rename(target_dir_ref, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileRef::Rename force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -628,7 +630,7 @@ std::string TestFileRef::TestRenameFileAndDirectory() {
return ReportError("FileRef::Rename", rv);
pp::FileRef nested_dir_ref(file_system, "/dir_rename_1/dir_rename_2");
- rv = nested_dir_ref.MakeDirectoryIncludingAncestors(callback);
+ rv = nested_dir_ref.MakeDirectoryIncludingAncestors(callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileRef::MakeDirectory force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -637,7 +639,7 @@ std::string TestFileRef::TestRenameFileAndDirectory() {
return ReportError("FileRef::MakeDirectoryIncludingAncestors", rv);
pp::FileRef target_nested_dir_ref(file_system, "/dir_rename_1");
- rv = nested_dir_ref.Rename(target_nested_dir_ref, callback);
+ rv = nested_dir_ref.Rename(target_nested_dir_ref, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileRef::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -653,7 +655,8 @@ std::string TestFileRef::TestRenameFileAndDirectory() {
{
pp::FileRef file_ref_abort(file_system, "/file_rename_abort");
pp::FileIO file_io_abort(instance_);
- rv = file_io_abort.Open(file_ref_abort, PP_FILEOPENFLAG_CREATE, callback);
+ rv = file_io_abort.Open(file_ref_abort, PP_FILEOPENFLAG_CREATE,
+ callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -662,7 +665,7 @@ std::string TestFileRef::TestRenameFileAndDirectory() {
return ReportError("FileIO::Open", rv);
callback.reset_run_count();
- rv = file_ref_abort.Rename(target_file_ref_abort, callback);
+ rv = file_ref_abort.Rename(target_file_ref_abort, callback.GetCallback());
}
if (callback.run_count() > 0)
return "FileSystem::Rename ran callback synchronously.";
@@ -683,7 +686,7 @@ std::string TestFileRef::TestRenameFileAndDirectory() {
std::string TestFileRef::TestFileNameEscaping() {
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
pp::FileSystem file_system(instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
- int32_t rv = file_system.Open(1024, callback);
+ int32_t rv = file_system.Open(1024, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileSystem::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -694,7 +697,7 @@ std::string TestFileRef::TestFileNameEscaping() {
std::string test_dir_path = "/dir_for_escaping_test";
// Create a directory in which to test.
pp::FileRef test_dir_ref(file_system, test_dir_path.c_str());
- rv = test_dir_ref.MakeDirectory(callback);
+ rv = test_dir_ref.MakeDirectory(callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileRef::MakeDirectory force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -706,7 +709,7 @@ std::string TestFileRef::TestFileNameEscaping() {
std::string full_file_path = test_dir_path + "/" + kTerribleName;
pp::FileRef file_ref(file_system, full_file_path.c_str());
pp::FileIO file_io(instance_);
- rv = file_io.Open(file_ref, PP_FILEOPENFLAG_CREATE, callback);
+ rv = file_io.Open(file_ref, PP_FILEOPENFLAG_CREATE, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("FileIO::Open force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
diff --git a/ppapi/tests/test_file_system.cc b/ppapi/tests/test_file_system.cc
index 3874295..9601f54 100644
--- a/ppapi/tests/test_file_system.cc
+++ b/ppapi/tests/test_file_system.cc
@@ -27,15 +27,15 @@ std::string TestFileSystem::TestOpen() {
// Open.
pp::FileSystem file_system(instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
- callback.WaitForResult(file_system.Open(1024, callback));
+ callback.WaitForResult(file_system.Open(1024, callback.GetCallback()));
CHECK_CALLBACK_BEHAVIOR(callback);
ASSERT_EQ(PP_OK, callback.result());
// Open aborted (see the DirectoryReader test for comments).
int32_t rv = 0;
{
- rv = pp::FileSystem(instance_,
- PP_FILESYSTEMTYPE_LOCALTEMPORARY).Open(1024, callback);
+ pp::FileSystem fs(instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
+ rv = fs.Open(1024, callback.GetCallback());
}
callback.WaitForAbortResult(rv);
CHECK_CALLBACK_BEHAVIOR(callback);
@@ -48,10 +48,10 @@ std::string TestFileSystem::TestMultipleOpens() {
// open has completed.
TestCompletionCallback callback_1(instance_->pp_instance(), force_async_);
pp::FileSystem file_system(instance_, PP_FILESYSTEMTYPE_LOCALTEMPORARY);
- int32_t rv_1 = file_system.Open(1024, callback_1);
+ int32_t rv_1 = file_system.Open(1024, callback_1.GetCallback());
TestCompletionCallback callback_2(instance_->pp_instance(), force_async_);
- callback_2.WaitForResult(file_system.Open(1024, callback_2));
+ callback_2.WaitForResult(file_system.Open(1024, callback_2.GetCallback()));
CHECK_CALLBACK_BEHAVIOR(callback_2);
// FileSystem should not allow multiple opens.
ASSERT_NE(PP_OK, callback_2.result());
@@ -61,7 +61,7 @@ std::string TestFileSystem::TestMultipleOpens() {
ASSERT_EQ(PP_OK, callback_1.result());
TestCompletionCallback callback_3(instance_->pp_instance(), force_async_);
- callback_3.WaitForResult(file_system.Open(1024, callback_3));
+ callback_3.WaitForResult(file_system.Open(1024, callback_3.GetCallback()));
CHECK_CALLBACK_BEHAVIOR(callback_3);
ASSERT_NE(PP_OK, callback_3.result());
diff --git a/ppapi/tests/test_graphics_2d.cc b/ppapi/tests/test_graphics_2d.cc
index 95ead3e..aea741d 100644
--- a/ppapi/tests/test_graphics_2d.cc
+++ b/ppapi/tests/test_graphics_2d.cc
@@ -96,7 +96,7 @@ bool TestGraphics2D::IsDCUniformColor(const pp::Graphics2D& dc,
bool TestGraphics2D::ResourceHealthCheck(pp::Instance* instance,
pp::Graphics2D* context) {
TestCompletionCallback callback(instance->pp_instance(), callback_type());
- callback.WaitForResult(context->Flush(callback));
+ callback.WaitForResult(context->Flush(callback.GetCallback()));
if (callback.result() < 0)
return callback.result() != PP_ERROR_FAILED;
else if (callback.result() == 0)
diff --git a/ppapi/tests/test_graphics_3d.cc b/ppapi/tests/test_graphics_3d.cc
index 65678c7..987d5a8 100644
--- a/ppapi/tests/test_graphics_3d.cc
+++ b/ppapi/tests/test_graphics_3d.cc
@@ -137,7 +137,7 @@ std::string TestGraphics3D::TestExtensionsGL() {
int32_t TestGraphics3D::SwapBuffersSync(pp::Graphics3D* context) {
TestCompletionCallback callback(instance_->pp_instance(), callback_type());
- int32_t rv = context->SwapBuffers(callback);
+ int32_t rv = context->SwapBuffers(callback.GetCallback());
if (rv != PP_OK_COMPLETIONPENDING)
return rv;
diff --git a/ppapi/tests/test_host_resolver_private.cc b/ppapi/tests/test_host_resolver_private.cc
index 8de75b3..5531e83 100644
--- a/ppapi/tests/test_host_resolver_private.cc
+++ b/ppapi/tests/test_host_resolver_private.cc
@@ -50,7 +50,7 @@ std::string TestHostResolverPrivate::SyncConnect(pp::TCPSocketPrivate* socket,
const std::string& host,
uint16_t port) {
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
- int32_t rv = socket->Connect(host.c_str(), port, callback);
+ int32_t rv = socket->Connect(host.c_str(), port, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("PPB_TCPSocket_Private::Connect force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -63,7 +63,7 @@ std::string TestHostResolverPrivate::SyncConnect(
pp::TCPSocketPrivate* socket,
const PP_NetAddress_Private& address) {
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
- int32_t rv = socket->ConnectWithNetAddress(&address, callback);
+ int32_t rv = socket->ConnectWithNetAddress(&address, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("PPB_TCPSocket_Private::Connect force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -77,7 +77,7 @@ std::string TestHostResolverPrivate::SyncRead(pp::TCPSocketPrivate* socket,
int32_t num_bytes,
int32_t* bytes_read) {
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
- int32_t rv = socket->Read(buffer, num_bytes, callback);
+ int32_t rv = socket->Read(buffer, num_bytes, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("PPB_TCPSocket_Private::Read force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -93,7 +93,7 @@ std::string TestHostResolverPrivate::SyncWrite(pp::TCPSocketPrivate* socket,
int32_t num_bytes,
int32_t* bytes_written) {
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
- int32_t rv = socket->Write(buffer, num_bytes, callback);
+ int32_t rv = socket->Write(buffer, num_bytes, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("PPB_TCPSocket_Private::Write force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -128,7 +128,7 @@ std::string TestHostResolverPrivate::SyncResolve(
uint16_t port,
const PP_HostResolver_Private_Hint& hint) {
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
- int32_t rv = host_resolver->Resolve(host, port, hint, callback);
+ int32_t rv = host_resolver->Resolve(host, port, hint, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("PPB_HostResolver_Private::Resolve force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
diff --git a/ppapi/tests/test_host_resolver_private_disallowed.cc b/ppapi/tests/test_host_resolver_private_disallowed.cc
index 17af810..cc5bce0 100644
--- a/ppapi/tests/test_host_resolver_private_disallowed.cc
+++ b/ppapi/tests/test_host_resolver_private_disallowed.cc
@@ -42,7 +42,8 @@ std::string TestHostResolverPrivateDisallowed::TestResolve() {
hint.family = PP_NETADDRESSFAMILY_UNSPECIFIED;
hint.flags = PP_HOST_RESOLVER_FLAGS_CANONNAME;
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
- int32_t rv = host_resolver.Resolve(host_, port_, hint, callback);
+ int32_t rv = host_resolver.Resolve(host_, port_, hint,
+ callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("PPB_HostResolver_Private::Resolve force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
diff --git a/ppapi/tests/test_mouse_lock.cc b/ppapi/tests/test_mouse_lock.cc
index 8376989..0c4efd4 100644
--- a/ppapi/tests/test_mouse_lock.cc
+++ b/ppapi/tests/test_mouse_lock.cc
@@ -41,7 +41,7 @@ std::string TestMouseLock::TestSucceedWhenAllowed() {
// Please see chrome/test/ppapi/ppapi_interactive_browsertest.cc.
TestCompletionCallback callback(instance_->pp_instance(), callback_type());
SimulateUserGesture();
- callback.WaitForResult(LockMouse(callback));
+ callback.WaitForResult(LockMouse(callback.GetCallback()));
ASSERT_EQ(PP_OK, callback.result());
UnlockMouse();
@@ -56,7 +56,7 @@ std::string TestMouseLock::TestFailWhenBlocked() {
// Please see chrome/test/ppapi/ppapi_interactive_browsertest.cc.
TestCompletionCallback callback(instance_->pp_instance(), callback_type());
SimulateUserGesture();
- callback.WaitForResult(LockMouse(callback));
+ callback.WaitForResult(LockMouse(callback.GetCallback()));
ASSERT_NE(PP_OK, callback.result());
PASS();
diff --git a/ppapi/tests/test_net_address_private_untrusted.cc b/ppapi/tests/test_net_address_private_untrusted.cc
index d8e0996..7ad64e2 100644
--- a/ppapi/tests/test_net_address_private_untrusted.cc
+++ b/ppapi/tests/test_net_address_private_untrusted.cc
@@ -57,7 +57,7 @@ int32_t TestNetAddressPrivateUntrusted::Connect(TCPSocketPrivate* socket,
uint16_t port) {
TestCompletionCallback callback(instance_->pp_instance(), false);
- int32_t rv = socket->Connect(host.c_str(), port, callback);
+ int32_t rv = socket->Connect(host.c_str(), port, callback.GetCallback());
if (rv == PP_OK_COMPLETIONPENDING)
rv = callback.WaitForResult();
return rv;
diff --git a/ppapi/tests/test_tcp_server_socket_private.cc b/ppapi/tests/test_tcp_server_socket_private.cc
index 26673b8..26b43e6 100644
--- a/ppapi/tests/test_tcp_server_socket_private.cc
+++ b/ppapi/tests/test_tcp_server_socket_private.cc
@@ -68,7 +68,7 @@ std::string TestTCPServerSocketPrivate::GetLocalAddress(
PP_NetAddress_Private* address) {
TCPSocketPrivate socket(instance_);
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
- int32_t rv = socket.Connect(host_.c_str(), port_, callback);
+ int32_t rv = socket.Connect(host_.c_str(), port_, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("PPB_TCPSocket_Private::Connect force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -86,7 +86,7 @@ std::string TestTCPServerSocketPrivate::SyncRead(TCPSocketPrivate* socket,
size_t num_bytes) {
while (num_bytes > 0) {
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
- int32_t rv = socket->Read(buffer, num_bytes, callback);
+ int32_t rv = socket->Read(buffer, num_bytes, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("PPB_TCPSocket_Private::Read force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -104,7 +104,7 @@ std::string TestTCPServerSocketPrivate::SyncWrite(TCPSocketPrivate* socket,
size_t num_bytes) {
while (num_bytes > 0) {
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
- int32_t rv = socket->Write(buffer, num_bytes, callback);
+ int32_t rv = socket->Write(buffer, num_bytes, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("PPB_TCPSocket_Private::Write force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -121,7 +121,7 @@ std::string TestTCPServerSocketPrivate::SyncConnect(
TCPSocketPrivate* socket,
PP_NetAddress_Private* address) {
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
- int32_t rv = socket->ConnectWithNetAddress(address, callback);
+ int32_t rv = socket->ConnectWithNetAddress(address, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("PPB_TCPSocket_Private::Connect force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -154,7 +154,7 @@ std::string TestTCPServerSocketPrivate::SyncListen(
return ReportError("PPB_NetAddress_Private::ReplacePort", 0);
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
- int32_t rv = socket->Listen(address, backlog, callback);
+ int32_t rv = socket->Listen(address, backlog, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("PPB_TCPServerSocket_Private::Listen force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -181,7 +181,8 @@ std::string TestTCPServerSocketPrivate::TestListen() {
TestCompletionCallback accept_callback(instance_->pp_instance(),
force_async_);
PP_Resource resource;
- int32_t accept_rv = server_socket.Accept(&resource, accept_callback);
+ int32_t accept_rv = server_socket.Accept(&resource,
+ accept_callback.GetCallback());
TCPSocketPrivate client_socket(instance_);
ForceConnect(&client_socket, &address);
@@ -233,7 +234,7 @@ std::string TestTCPServerSocketPrivate::TestBacklog() {
force_async_);
connect_rv[i] = client_sockets[i]->ConnectWithNetAddress(
&address,
- *connect_callbacks[i]);
+ connect_callbacks[i]->GetCallback());
if (force_async_ && connect_rv[i] != PP_OK_COMPLETIONPENDING) {
return ReportError("PPB_TCPSocket_Private::Connect force_async",
connect_rv[i]);
@@ -244,7 +245,7 @@ std::string TestTCPServerSocketPrivate::TestBacklog() {
std::vector<TCPSocketPrivate*> accepted_sockets(kBacklog);
for (size_t i = 0; i < kBacklog; ++i) {
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
- int32_t rv = server_socket.Accept(&resources[i], callback);
+ int32_t rv = server_socket.Accept(&resources[i], callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("PPB_TCPServerSocket_Private::Accept force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
diff --git a/ppapi/tests/test_tcp_server_socket_private_disallowed.cc b/ppapi/tests/test_tcp_server_socket_private_disallowed.cc
index 86036d7..55a61a6c 100644
--- a/ppapi/tests/test_tcp_server_socket_private_disallowed.cc
+++ b/ppapi/tests/test_tcp_server_socket_private_disallowed.cc
@@ -74,8 +74,7 @@ std::string TestTCPServerSocketPrivateDisallowed::TestListen() {
socket,
&current_address,
1,
- static_cast<pp::CompletionCallback>(
- callback).pp_completion_callback());
+ callback.GetCallback().pp_completion_callback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("PPB_TCPServerSocket_Private::Listen force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
diff --git a/ppapi/tests/test_tcp_socket_private.cc b/ppapi/tests/test_tcp_socket_private.cc
index 17fbe1a..a15c36e 100644
--- a/ppapi/tests/test_tcp_socket_private.cc
+++ b/ppapi/tests/test_tcp_socket_private.cc
@@ -58,7 +58,7 @@ std::string TestTCPSocketPrivate::TestBasic() {
pp::TCPSocketPrivate socket(instance_);
TestCompletionCallback cb(instance_->pp_instance(), force_async_);
- int32_t rv = socket.Connect(host_.c_str(), port_, cb);
+ int32_t rv = socket.Connect(host_.c_str(), port_, cb.GetCallback());
ASSERT_TRUE(!force_async_ || rv == PP_OK_COMPLETIONPENDING);
if (rv == PP_OK_COMPLETIONPENDING)
rv = cb.WaitForResult();
@@ -78,7 +78,7 @@ std::string TestTCPSocketPrivate::TestReadWrite() {
pp::TCPSocketPrivate socket(instance_);
TestCompletionCallback cb(instance_->pp_instance(), force_async_);
- int32_t rv = socket.Connect(host_.c_str(), port_, cb);
+ int32_t rv = socket.Connect(host_.c_str(), port_, cb.GetCallback());
ASSERT_TRUE(!force_async_ || rv == PP_OK_COMPLETIONPENDING);
if (rv == PP_OK_COMPLETIONPENDING)
rv = cb.WaitForResult();
@@ -100,13 +100,13 @@ std::string TestTCPSocketPrivate::TestReadWriteSSL() {
pp::TCPSocketPrivate socket(instance_);
TestCompletionCallback cb(instance_->pp_instance(), force_async_);
- int32_t rv = socket.Connect(host_.c_str(), ssl_port_, cb);
+ int32_t rv = socket.Connect(host_.c_str(), ssl_port_, cb.GetCallback());
ASSERT_TRUE(!force_async_ || rv == PP_OK_COMPLETIONPENDING);
if (rv == PP_OK_COMPLETIONPENDING)
rv = cb.WaitForResult();
ASSERT_EQ(PP_OK, rv);
- rv = socket.SSLHandshake(host_.c_str(), ssl_port_, cb);
+ rv = socket.SSLHandshake(host_.c_str(), ssl_port_, cb.GetCallback());
ASSERT_TRUE(!force_async_ || rv == PP_OK_COMPLETIONPENDING);
if (rv == PP_OK_COMPLETIONPENDING)
rv = cb.WaitForResult();
@@ -131,7 +131,7 @@ std::string TestTCPSocketPrivate::TestConnectAddress() {
{
pp::TCPSocketPrivate socket(instance_);
TestCompletionCallback cb(instance_->pp_instance(), force_async_);
- int32_t rv = socket.Connect(host_.c_str(), port_, cb);
+ int32_t rv = socket.Connect(host_.c_str(), port_, cb.GetCallback());
ASSERT_TRUE(!force_async_ || rv == PP_OK_COMPLETIONPENDING);
if (rv == PP_OK_COMPLETIONPENDING)
rv = cb.WaitForResult();
@@ -144,7 +144,7 @@ std::string TestTCPSocketPrivate::TestConnectAddress() {
// Connect to that address.
pp::TCPSocketPrivate socket(instance_);
TestCompletionCallback cb(instance_->pp_instance(), force_async_);
- int32_t rv = socket.ConnectWithNetAddress(&address, cb);
+ int32_t rv = socket.ConnectWithNetAddress(&address, cb.GetCallback());
ASSERT_TRUE(!force_async_ || rv == PP_OK_COMPLETIONPENDING);
if (rv == PP_OK_COMPLETIONPENDING)
rv = cb.WaitForResult();
@@ -165,25 +165,26 @@ std::string TestTCPSocketPrivate::TestSetOption() {
pp::TCPSocketPrivate socket(instance_);
TestCompletionCallback cb(instance_->pp_instance(), force_async_);
- int32_t rv = socket.SetOption(PP_TCPSOCKETOPTION_NO_DELAY, true, cb);
+ int32_t rv = socket.SetOption(PP_TCPSOCKETOPTION_NO_DELAY, true,
+ cb.GetCallback());
ASSERT_TRUE(!force_async_ || rv == PP_OK_COMPLETIONPENDING);
if (rv == PP_OK_COMPLETIONPENDING)
rv = cb.WaitForResult();
ASSERT_EQ(PP_ERROR_FAILED, rv);
- rv = socket.Connect(host_.c_str(), port_, cb);
+ rv = socket.Connect(host_.c_str(), port_, cb.GetCallback());
ASSERT_TRUE(!force_async_ || rv == PP_OK_COMPLETIONPENDING);
if (rv == PP_OK_COMPLETIONPENDING)
rv = cb.WaitForResult();
ASSERT_EQ(PP_OK, rv);
- rv = socket.SetOption(PP_TCPSOCKETOPTION_NO_DELAY, true, cb);
+ rv = socket.SetOption(PP_TCPSOCKETOPTION_NO_DELAY, true, cb.GetCallback());
ASSERT_TRUE(!force_async_ || rv == PP_OK_COMPLETIONPENDING);
if (rv == PP_OK_COMPLETIONPENDING)
rv = cb.WaitForResult();
ASSERT_EQ(PP_OK, rv);
- rv = socket.SetOption(PP_TCPSOCKETOPTION_INVALID, true, cb);
+ rv = socket.SetOption(PP_TCPSOCKETOPTION_INVALID, true, cb.GetCallback());
ASSERT_TRUE(!force_async_ || rv == PP_OK_COMPLETIONPENDING);
if (rv == PP_OK_COMPLETIONPENDING)
rv = cb.WaitForResult();
@@ -203,7 +204,7 @@ int32_t TestTCPSocketPrivate::ReadFirstLineFromSocket(
// Make sure we don't just hang if |Read()| spews.
while (s->size() < 1000000) {
TestCompletionCallback cb(instance_->pp_instance(), force_async_);
- int32_t rv = socket->Read(buffer, sizeof(buffer), cb);
+ int32_t rv = socket->Read(buffer, sizeof(buffer), cb.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return PP_ERROR_FAILED;
if (rv == PP_OK_COMPLETIONPENDING)
@@ -228,7 +229,8 @@ int32_t TestTCPSocketPrivate::WriteStringToSocket(pp::TCPSocketPrivate* socket,
size_t written = 0;
while (written < s.size()) {
TestCompletionCallback cb(instance_->pp_instance(), force_async_);
- int32_t rv = socket->Write(buffer + written, s.size() - written, cb);
+ int32_t rv = socket->Write(buffer + written, s.size() - written,
+ cb.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return PP_ERROR_FAILED;
if (rv == PP_OK_COMPLETIONPENDING)
diff --git a/ppapi/tests/test_tcp_socket_private_disallowed.cc b/ppapi/tests/test_tcp_socket_private_disallowed.cc
index 25e60dc..6325a4f 100644
--- a/ppapi/tests/test_tcp_socket_private_disallowed.cc
+++ b/ppapi/tests/test_tcp_socket_private_disallowed.cc
@@ -41,7 +41,7 @@ std::string TestTCPSocketPrivateDisallowed::TestConnect() {
TestCompletionCallback callback(instance_->pp_instance());
int32_t rv = tcp_socket_private_interface_->Connect(
socket, kServerName, kPort,
- static_cast<pp::CompletionCallback>(callback).pp_completion_callback());
+ callback.GetCallback().pp_completion_callback());
if (PP_OK_COMPLETIONPENDING == rv)
rv = callback.WaitForResult();
diff --git a/ppapi/tests/test_tcp_socket_private_trusted.cc b/ppapi/tests/test_tcp_socket_private_trusted.cc
index debb3ce..82c2257 100644
--- a/ppapi/tests/test_tcp_socket_private_trusted.cc
+++ b/ppapi/tests/test_tcp_socket_private_trusted.cc
@@ -42,13 +42,13 @@ std::string TestTCPSocketPrivateTrusted::TestGetServerCertificate() {
pp::TCPSocketPrivate socket(instance_);
TestCompletionCallback cb(instance_->pp_instance(), force_async_);
- int32_t rv = socket.Connect(host_.c_str(), ssl_port_, cb);
+ int32_t rv = socket.Connect(host_.c_str(), ssl_port_, cb.GetCallback());
ASSERT_TRUE(!force_async_ || rv == PP_OK_COMPLETIONPENDING);
if (rv == PP_OK_COMPLETIONPENDING)
rv = cb.WaitForResult();
ASSERT_EQ(PP_OK, rv);
- rv = socket.SSLHandshake(host_.c_str(), ssl_port_, cb);
+ rv = socket.SSLHandshake(host_.c_str(), ssl_port_, cb.GetCallback());
ASSERT_TRUE(!force_async_ || rv == PP_OK_COMPLETIONPENDING);
if (rv == PP_OK_COMPLETIONPENDING)
rv = cb.WaitForResult();
diff --git a/ppapi/tests/test_udp_socket_private.cc b/ppapi/tests/test_udp_socket_private.cc
index 4680ff2..995b53a 100644
--- a/ppapi/tests/test_udp_socket_private.cc
+++ b/ppapi/tests/test_udp_socket_private.cc
@@ -64,7 +64,7 @@ std::string TestUDPSocketPrivate::GetLocalAddress(
PP_NetAddress_Private* address) {
pp::TCPSocketPrivate socket(instance_);
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
- int32_t rv = socket.Connect(host_.c_str(), port_, callback);
+ int32_t rv = socket.Connect(host_.c_str(), port_, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("PPB_TCPSocket_Private::Connect force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -95,7 +95,7 @@ std::string TestUDPSocketPrivate::BindUDPSocket(
pp::UDPSocketPrivate* socket,
PP_NetAddress_Private* address) {
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
- int32_t rv = socket->Bind(address, callback);
+ int32_t rv = socket->Bind(address, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("PPB_UDPSocket_Private::Bind force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -131,7 +131,7 @@ std::string TestUDPSocketPrivate::BindUDPSocketFailure(
pp::UDPSocketPrivate* socket,
PP_NetAddress_Private *address) {
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
- int32_t rv = socket->Bind(address, callback);
+ int32_t rv = socket->Bind(address, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("PPB_UDPSocket_Private::Bind force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -149,7 +149,7 @@ std::string TestUDPSocketPrivate::ReadSocket(pp::UDPSocketPrivate* socket,
std::string* message) {
std::vector<char> buffer(size);
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
- int32_t rv = socket->RecvFrom(&buffer[0], size, callback);
+ int32_t rv = socket->RecvFrom(&buffer[0], size, callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("PPB_UDPSocket_Private::RecvFrom force_async", rv);
if (rv == PP_OK_COMPLETIONPENDING)
@@ -166,7 +166,7 @@ std::string TestUDPSocketPrivate::PassMessage(pp::UDPSocketPrivate* target,
const std::string& message) {
TestCompletionCallback callback(instance_->pp_instance(), force_async_);
int32_t rv = source->SendTo(message.c_str(), message.size(), address,
- callback);
+ callback.GetCallback());
if (force_async_ && rv != PP_OK_COMPLETIONPENDING)
return ReportError("PPB_UDPSocket_Private::SendTo force_async", rv);
diff --git a/ppapi/tests/test_udp_socket_private_disallowed.cc b/ppapi/tests/test_udp_socket_private_disallowed.cc
index fa0c179..655ed35 100644
--- a/ppapi/tests/test_udp_socket_private_disallowed.cc
+++ b/ppapi/tests/test_udp_socket_private_disallowed.cc
@@ -37,7 +37,7 @@ std::string TestUDPSocketPrivateDisallowed::TestBind() {
TestCompletionCallback callback(instance_->pp_instance());
int32_t rv = udp_socket_private_interface_->Bind(socket, &addr,
- static_cast<pp::CompletionCallback>(callback).pp_completion_callback());
+ callback.GetCallback().pp_completion_callback());
if (PP_OK_COMPLETIONPENDING == rv)
rv = callback.WaitForResult();
diff --git a/ppapi/tests/test_url_loader.cc b/ppapi/tests/test_url_loader.cc
index 9024491..112a483 100644
--- a/ppapi/tests/test_url_loader.cc
+++ b/ppapi/tests/test_url_loader.cc
@@ -44,7 +44,7 @@ int32_t WriteEntireBuffer(PP_Instance instance,
callback.WaitForResult(file_io->Write(write_offset,
&buf[write_offset - offset],
size - write_offset + offset,
- callback));
+ callback.GetCallback()));
if (callback.result() < 0)
return callback.result();
if (callback.result() == 0)
@@ -128,7 +128,8 @@ std::string TestURLLoader::ReadEntireFile(pp::FileIO* file_io,
int64_t offset = 0;
for (;;) {
- callback.WaitForResult(file_io->Read(offset, buf, sizeof(buf), callback));
+ callback.WaitForResult(file_io->Read(offset, buf, sizeof(buf),
+ callback.GetCallback()));
if (callback.result() < 0)
return ReportError("FileIO::Read", callback.result());
if (callback.result() == 0)
@@ -147,7 +148,7 @@ std::string TestURLLoader::ReadEntireResponseBody(pp::URLLoader* loader,
for (;;) {
callback.WaitForResult(
- loader->ReadResponseBody(buf, sizeof(buf), callback));
+ loader->ReadResponseBody(buf, sizeof(buf), callback.GetCallback()));
if (callback.result() < 0)
return ReportError("URLLoader::ReadResponseBody", callback.result());
if (callback.result() == 0)
@@ -164,7 +165,7 @@ std::string TestURLLoader::LoadAndCompareBody(
TestCompletionCallback callback(instance_->pp_instance(), callback_type());
pp::URLLoader loader(instance_);
- callback.WaitForResult(loader.Open(request, callback));
+ callback.WaitForResult(loader.Open(request, callback.GetCallback()));
CHECK_CALLBACK_BEHAVIOR(callback);
ASSERT_EQ(PP_OK, callback.result());
@@ -191,7 +192,7 @@ std::string TestURLLoader::LoadAndCompareBody(
int32_t TestURLLoader::OpenFileSystem(pp::FileSystem* file_system,
std::string* message) {
TestCompletionCallback callback(instance_->pp_instance(), callback_type());
- callback.WaitForResult(file_system->Open(1024, callback));
+ callback.WaitForResult(file_system->Open(1024, callback.GetCallback()));
if (callback.failed()) {
message->assign(callback.errors());
return callback.result();
@@ -213,7 +214,7 @@ int32_t TestURLLoader::PrepareFileForPost(
PP_FILEOPENFLAG_CREATE |
PP_FILEOPENFLAG_TRUNCATE |
PP_FILEOPENFLAG_WRITE,
- callback));
+ callback.GetCallback()));
if (callback.failed()) {
message->assign(callback.errors());
return callback.result();
@@ -297,7 +298,7 @@ int32_t TestURLLoader::Open(const pp::URLRequestInfo& request,
if (trusted)
url_loader_trusted_interface_->GrantUniversalAccess(loader.pp_resource());
TestCompletionCallback callback(instance_->pp_instance(), callback_type());
- callback.WaitForResult(loader.Open(request, callback));
+ callback.WaitForResult(loader.Open(request, callback.GetCallback()));
return callback.result();
}
@@ -421,7 +422,7 @@ std::string TestURLLoader::TestStreamToFile() {
TestCompletionCallback callback(instance_->pp_instance(), callback_type());
pp::URLLoader loader(instance_);
- callback.WaitForResult(loader.Open(request, callback));
+ callback.WaitForResult(loader.Open(request, callback.GetCallback()));
CHECK_CALLBACK_BEHAVIOR(callback);
ASSERT_EQ(PP_OK, callback.result());
@@ -436,12 +437,13 @@ std::string TestURLLoader::TestStreamToFile() {
if (body.is_null())
return "URLResponseInfo::GetBody returned null";
- callback.WaitForResult(loader.FinishStreamingToFile(callback));
+ callback.WaitForResult(loader.FinishStreamingToFile(callback.GetCallback()));
CHECK_CALLBACK_BEHAVIOR(callback);
ASSERT_EQ(PP_OK, callback.result());
pp::FileIO reader(instance_);
- callback.WaitForResult(reader.Open(body, PP_FILEOPENFLAG_READ, callback));
+ callback.WaitForResult(reader.Open(body, PP_FILEOPENFLAG_READ,
+ callback.GetCallback()));
CHECK_CALLBACK_BEHAVIOR(callback);
ASSERT_EQ(PP_OK, callback.result());
@@ -697,7 +699,7 @@ std::string TestURLLoader::TestAuditURLRedirect() {
TestCompletionCallback callback(instance_->pp_instance(), callback_type());
pp::URLLoader loader(instance_);
- callback.WaitForResult(loader.Open(request, callback));
+ callback.WaitForResult(loader.Open(request, callback.GetCallback()));
CHECK_CALLBACK_BEHAVIOR(callback);
ASSERT_EQ(PP_OK, callback.result());
@@ -711,7 +713,7 @@ std::string TestURLLoader::TestAuditURLRedirect() {
return "Response status should be 301";
// Test that the paused loader can be resumed.
- callback.WaitForResult(loader.FollowRedirect(callback));
+ callback.WaitForResult(loader.FollowRedirect(callback.GetCallback()));
CHECK_CALLBACK_BEHAVIOR(callback);
ASSERT_EQ(PP_OK, callback.result());
std::string body;
@@ -734,7 +736,7 @@ std::string TestURLLoader::TestAbortCalls() {
// Abort |Open()|.
{
- rv = pp::URLLoader(instance_).Open(request, callback);
+ rv = pp::URLLoader(instance_).Open(request, callback.GetCallback());
}
callback.WaitForAbortResult(rv);
CHECK_CALLBACK_BEHAVIOR(callback);
@@ -744,11 +746,11 @@ std::string TestURLLoader::TestAbortCalls() {
char buf[2] = { 0 };
{
pp::URLLoader loader(instance_);
- callback.WaitForResult(loader.Open(request, callback));
+ callback.WaitForResult(loader.Open(request, callback.GetCallback()));
CHECK_CALLBACK_BEHAVIOR(callback);
ASSERT_EQ(PP_OK, callback.result());
- rv = loader.ReadResponseBody(buf, sizeof(buf), callback);
+ rv = loader.ReadResponseBody(buf, sizeof(buf), callback.GetCallback());
} // Destroy |loader|.
callback.WaitForAbortResult(rv);
CHECK_CALLBACK_BEHAVIOR(callback);
@@ -773,7 +775,7 @@ std::string TestURLLoader::TestUntendedLoad() {
TestCompletionCallback callback(instance_->pp_instance(), callback_type());
pp::URLLoader loader(instance_);
- callback.WaitForResult(loader.Open(request, callback));
+ callback.WaitForResult(loader.Open(request, callback.GetCallback()));
CHECK_CALLBACK_BEHAVIOR(callback);
ASSERT_EQ(PP_OK, callback.result());
@@ -793,7 +795,7 @@ std::string TestURLLoader::TestUntendedLoad() {
// with GetForMainThread. We only need to yield on the main
// thread.
if (callback_type() != PP_BLOCKING) {
- pp::Module::Get()->core()->CallOnMainThread(10, callback);
+ pp::Module::Get()->core()->CallOnMainThread(10, callback.GetCallback());
callback.WaitForResult();
}
}
diff --git a/ppapi/tests/test_utils.h b/ppapi/tests/test_utils.h
index 09e0b94..e61efbd 100644
--- a/ppapi/tests/test_utils.h
+++ b/ppapi/tests/test_utils.h
@@ -133,9 +133,6 @@ class TestCompletionCallback {
// Retrieve a pp::CompletionCallback for use in testing. This Reset()s the
// TestCompletionCallback.
pp::CompletionCallback GetCallback();
- operator pp::CompletionCallback() {
- return GetCallback();
- }
// TODO(dmichael): Remove run_count when all tests are updated. Most cases
// that use this can simply use CHECK_CALLBACK_BEHAVIOR.
diff --git a/ppapi/tests/test_websocket.cc b/ppapi/tests/test_websocket.cc
index 5b400ee..c0f813e 100644
--- a/ppapi/tests/test_websocket.cc
+++ b/ppapi/tests/test_websocket.cc
@@ -1113,7 +1113,8 @@ std::string TestWebSocket::TestCcInterfaces() {
TestCompletionCallback connect_callback(
instance_->pp_instance(), callback_type());
connect_callback.WaitForResult(ws.Connect(
- pp::Var(GetFullURL(kCloseServerURL)), NULL, 0U, connect_callback));
+ pp::Var(GetFullURL(kCloseServerURL)), NULL, 0U,
+ connect_callback.GetCallback()));
CHECK_CALLBACK_BEHAVIOR(connect_callback);
ASSERT_EQ(PP_OK, connect_callback.result());
@@ -1132,7 +1133,8 @@ std::string TestWebSocket::TestCcInterfaces() {
TestCompletionCallback text_receive_callback(
instance_->pp_instance(), callback_type());
text_receive_callback.WaitForResult(
- ws.ReceiveMessage(&text_receive_var, text_receive_callback));
+ ws.ReceiveMessage(&text_receive_var,
+ text_receive_callback.GetCallback()));
ASSERT_EQ(PP_OK, text_receive_callback.result());
ASSERT_TRUE(
AreEqualWithString(text_receive_var.pp_var(), text_message.c_str()));
@@ -1141,7 +1143,8 @@ std::string TestWebSocket::TestCcInterfaces() {
TestCompletionCallback binary_receive_callback(
instance_->pp_instance(), callback_type());
binary_receive_callback.WaitForResult(
- ws.ReceiveMessage(&binary_receive_var, binary_receive_callback));
+ ws.ReceiveMessage(&binary_receive_var,
+ binary_receive_callback.GetCallback()));
ASSERT_EQ(PP_OK, binary_receive_callback.result());
ASSERT_TRUE(AreEqualWithBinary(binary_receive_var.pp_var(), binary));
@@ -1149,7 +1152,8 @@ std::string TestWebSocket::TestCcInterfaces() {
instance_->pp_instance(), callback_type());
std::string reason("bye");
close_callback.WaitForResult(ws.Close(
- PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE, pp::Var(reason), close_callback));
+ PP_WEBSOCKETSTATUSCODE_NORMAL_CLOSURE, pp::Var(reason),
+ close_callback.GetCallback()));
CHECK_CALLBACK_BEHAVIOR(close_callback);
ASSERT_EQ(PP_OK, close_callback.result());
generated by cgit v1.1 at 2025-03-02 23:16:56 +0000