| 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 7716940f5a51c94e0e65570d46e97d7121528a5d..1eeb16cb46fb43d3f504a486d8b4ace95846bc3c 100644
|
| --- a/ppapi/proxy/video_decoder_resource_unittest.cc
|
| +++ b/ppapi/proxy/video_decoder_resource_unittest.cc
|
| @@ -58,9 +58,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,
|
| @@ -117,6 +117,7 @@ class VideoDecoderResourceTest : public PluginProxyTest {
|
| graphics3d.get(),
|
| PP_VIDEOPROFILE_H264MAIN,
|
| PP_HARDWAREACCELERATION_WITHFALLBACK,
|
| + 0,
|
| PP_MakeOptionalCompletionCallback(&MockCompletionCallback::Callback,
|
| &cb));
|
| if (result != PP_OK_COMPLETIONPENDING)
|
| @@ -297,7 +298,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];
|
| };
|
| @@ -314,6 +315,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);
|
| @@ -327,6 +329,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);
|
| @@ -341,6 +344,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);
|
| @@ -352,6 +356,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);
|
|
|