Index: ppapi/tests/test_video_decoder.cc |
=================================================================== |
--- ppapi/tests/test_video_decoder.cc (revision 87892) |
+++ ppapi/tests/test_video_decoder.cc (working copy) |
@@ -6,6 +6,7 @@ |
#include "ppapi/c/dev/ppb_video_decoder_dev.h" |
#include "ppapi/c/dev/ppb_testing_dev.h" |
+#include "ppapi/c/pp_errors.h" |
#include "ppapi/c/ppb_var.h" |
#include "ppapi/tests/testing_instance.h" |
@@ -20,18 +21,24 @@ |
} |
void TestVideoDecoder::RunTest() { |
- instance_->LogTest("Create", TestCreate()); |
+ RUN_TEST(CreateAndInitialize); |
} |
void TestVideoDecoder::QuitMessageLoop() { |
testing_interface_->QuitMessageLoop(instance_->pp_instance()); |
} |
-std::string TestVideoDecoder::TestCreate() { |
+std::string TestVideoDecoder::TestCreateAndInitialize() { |
PP_Resource decoder = video_decoder_interface_->Create( |
- instance_->pp_instance(), NULL, PP_MakeCompletionCallback(NULL, NULL)); |
- if (decoder == 0) { |
- return "Error creating the decoder"; |
- } |
+ instance_->pp_instance()); |
+ if (decoder == 0) |
+ return "Create: error creating the decoder"; |
+ |
+ int32_t pp_error = video_decoder_interface_->Initialize( |
+ decoder, NULL, PP_BlockUntilComplete()); |
+ pp::Module::Get()->core()->ReleaseResource(decoder); |
+ if (pp_error != PP_ERROR_BADARGUMENT) |
+ return "Initialize: error detecting null callback"; |
+ |
PASS(); |
} |