Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(564)

Unified Diff: ppapi/tests/test_video_decoder.cc

Issue 6975053: PPAPI: Fix interface functions that take PP_CompletionCallbacks, but don't (Closed) Base URL: svn://chrome-svn/chrome/trunk/src/
Patch Set: '' Created 9 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « ppapi/tests/test_video_decoder.h ('k') | webkit/plugins/ppapi/ppb_layer_compositor_impl.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
« no previous file with comments | « ppapi/tests/test_video_decoder.h ('k') | webkit/plugins/ppapi/ppb_layer_compositor_impl.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698