| Index: ppapi/proxy/video_decoder_resource_unittest.cc
|
| diff --git a/ppapi/proxy/video_decoder_resource_unittest.cc b/ppapi/proxy/video_decoder_resource_unittest.cc
|
| index c07f3b062220e549eab535876cefde716518042e..5a128d14db5ac9445265a95a3086cd63368c7fa3 100644
|
| --- a/ppapi/proxy/video_decoder_resource_unittest.cc
|
| +++ b/ppapi/proxy/video_decoder_resource_unittest.cc
|
| @@ -60,9 +60,9 @@ class MockCompletionCallback {
|
| class VideoDecoderResourceTest : public PluginProxyTest {
|
| public:
|
| VideoDecoderResourceTest()
|
| - : decoder_iface_(thunk::GetPPB_VideoDecoder_1_0_Thunk()) {}
|
| + : decoder_iface_(thunk::GetPPB_VideoDecoder_1_1_Thunk()) {}
|
|
|
| - const PPB_VideoDecoder_1_0* decoder_iface() const { return decoder_iface_; }
|
| + const PPB_VideoDecoder_1_1* decoder_iface() const { return decoder_iface_; }
|
|
|
| void SendReply(const ResourceMessageCallParams& params,
|
| int32_t result,
|
| @@ -119,6 +119,7 @@ class VideoDecoderResourceTest : public PluginProxyTest {
|
| graphics3d.get(),
|
| PP_VIDEOPROFILE_H264MAIN,
|
| PP_HARDWAREACCELERATION_WITHFALLBACK,
|
| + 0,
|
| PP_MakeOptionalCompletionCallback(&MockCompletionCallback::Callback,
|
| &cb));
|
| if (result != PP_OK_COMPLETIONPENDING)
|
| @@ -299,7 +300,7 @@ class VideoDecoderResourceTest : public PluginProxyTest {
|
| return true;
|
| }
|
|
|
| - const PPB_VideoDecoder_1_0* decoder_iface_;
|
| + const PPB_VideoDecoder_1_1* decoder_iface_;
|
|
|
| char decode_buffer_[kDecodeBufferSize];
|
| };
|
| @@ -316,6 +317,7 @@ TEST_F(VideoDecoderResourceTest, Initialize) {
|
| 0 /* invalid 3d graphics */,
|
| PP_VIDEOPROFILE_H264MAIN,
|
| PP_HARDWAREACCELERATION_WITHFALLBACK,
|
| + 0,
|
| PP_MakeOptionalCompletionCallback(&MockCompletionCallback::Callback,
|
| &cb));
|
| ASSERT_EQ(PP_ERROR_BADRESOURCE, result);
|
| @@ -329,6 +331,7 @@ TEST_F(VideoDecoderResourceTest, Initialize) {
|
| 1 /* non-zero resource */,
|
| static_cast<PP_VideoProfile>(-1),
|
| PP_HARDWAREACCELERATION_WITHFALLBACK,
|
| + 0,
|
| PP_MakeOptionalCompletionCallback(&MockCompletionCallback::Callback,
|
| &cb));
|
| ASSERT_EQ(PP_ERROR_BADARGUMENT, result);
|
| @@ -343,6 +346,7 @@ TEST_F(VideoDecoderResourceTest, Initialize) {
|
| graphics3d.get(),
|
| PP_VIDEOPROFILE_H264MAIN,
|
| PP_HARDWAREACCELERATION_WITHFALLBACK,
|
| + 0,
|
| PP_MakeOptionalCompletionCallback(&MockCompletionCallback::Callback,
|
| &cb));
|
| ASSERT_EQ(PP_OK_COMPLETIONPENDING, result);
|
| @@ -354,6 +358,7 @@ TEST_F(VideoDecoderResourceTest, Initialize) {
|
| graphics3d.get(),
|
| PP_VIDEOPROFILE_H264MAIN,
|
| PP_HARDWAREACCELERATION_WITHFALLBACK,
|
| + 0,
|
| PP_MakeOptionalCompletionCallback(&MockCompletionCallback::Callback,
|
| &cb));
|
| ASSERT_EQ(PP_ERROR_INPROGRESS, result);
|
|
|