Index: content/renderer/media/rtc_video_decoder_unittest.cc |
diff --git a/content/renderer/media/rtc_video_decoder_unittest.cc b/content/renderer/media/rtc_video_decoder_unittest.cc |
index e23e91b9aaca253695a813b5e27b0079c2d2d3d3..fdb03e95062306b4efbb811e97303f13e672d1ad 100644 |
--- a/content/renderer/media/rtc_video_decoder_unittest.cc |
+++ b/content/renderer/media/rtc_video_decoder_unittest.cc |
@@ -8,7 +8,7 @@ |
#include "base/threading/thread.h" |
#include "content/renderer/media/rtc_video_decoder.h" |
#include "media/base/gmock_callback_support.h" |
-#include "media/filters/mock_gpu_video_decoder_factories.h" |
+#include "media/filters/mock_gpu_video_accelerator_factories.h" |
#include "media/video/mock_video_decode_accelerator.h" |
#include "testing/gtest/include/gtest/gtest.h" |
@@ -24,7 +24,7 @@ class RTCVideoDecoderTest : public ::testing::Test, |
webrtc::DecodedImageCallback { |
public: |
RTCVideoDecoderTest() |
- : mock_gpu_factories_(new media::MockGpuVideoDecoderFactories), |
+ : mock_gpu_factories_(new media::MockGpuVideoAcceleratorFactories), |
vda_thread_("vda_thread"), |
idle_waiter_(false, false) { |
memset(&codec_, 0, sizeof(codec_)); |
@@ -36,11 +36,11 @@ class RTCVideoDecoderTest : public ::testing::Test, |
mock_vda_ = new media::MockVideoDecodeAccelerator; |
EXPECT_CALL(*mock_gpu_factories_, GetMessageLoop()) |
.WillRepeatedly(Return(vda_loop_proxy_)); |
- EXPECT_CALL(*mock_gpu_factories_, CreateVideoDecodeAccelerator(_, _)) |
+ EXPECT_CALL(*mock_gpu_factories_, DoCreateVideoDecodeAccelerator(_, _)) |
.WillRepeatedly( |
Return(static_cast<media::VideoDecodeAccelerator*>(NULL))); |
EXPECT_CALL(*mock_gpu_factories_, |
- CreateVideoDecodeAccelerator(media::VP8PROFILE_MAIN, _)) |
+ DoCreateVideoDecodeAccelerator(media::VP8PROFILE_MAIN, _)) |
.WillRepeatedly(Return(mock_vda_)); |
EXPECT_CALL(*mock_gpu_factories_, Abort()).WillRepeatedly(Return()); |
EXPECT_CALL(*mock_gpu_factories_, CreateSharedMemory(_)) |
@@ -95,7 +95,7 @@ class RTCVideoDecoderTest : public ::testing::Test, |
} |
protected: |
- scoped_refptr<media::MockGpuVideoDecoderFactories> mock_gpu_factories_; |
+ scoped_refptr<media::MockGpuVideoAcceleratorFactories> mock_gpu_factories_; |
media::MockVideoDecodeAccelerator* mock_vda_; |
scoped_ptr<RTCVideoDecoder> rtc_decoder_; |
webrtc::VideoCodec codec_; |