Index: ppapi/tests/test_utils.cc |
=================================================================== |
--- ppapi/tests/test_utils.cc (revision 82761) |
+++ ppapi/tests/test_utils.cc (working copy) |
@@ -28,11 +28,21 @@ |
TestCompletionCallback::TestCompletionCallback(PP_Instance instance) |
: result_(PP_OK_COMPLETIONPENDING), |
+ force_async_(false), |
post_quit_task_(false), |
run_count_(0), |
instance_(instance) { |
} |
+TestCompletionCallback::TestCompletionCallback(PP_Instance instance, |
+ bool force_async) |
+ : result_(PP_OK_COMPLETIONPENDING), |
+ force_async_(force_async), |
+ post_quit_task_(false), |
+ run_count_(0), |
+ instance_(instance) { |
+} |
+ |
int32_t TestCompletionCallback::WaitForResult() { |
result_ = PP_OK_COMPLETIONPENDING; // Reset |
post_quit_task_ = true; |
@@ -41,8 +51,11 @@ |
} |
TestCompletionCallback::operator pp::CompletionCallback() const { |
- return pp::CompletionCallback(&TestCompletionCallback::Handler, |
- const_cast<TestCompletionCallback*>(this)); |
+ pp::CompletionCallback cc(&TestCompletionCallback::Handler, |
+ const_cast<TestCompletionCallback*>(this)); |
+ if (!force_async_) |
+ cc.set_flags(PP_COMPLETIONCALLBACK_FLAG_NOFORCEASYNC); |
+ return cc; |
} |
// static |