| Index: webkit/support/test_media_stream_client.cc
|
| diff --git a/webkit/support/test_media_stream_client.cc b/webkit/support/test_media_stream_client.cc
|
| index 69df55ac474507dbe2471e3ce6188211e33d6a03..cd729b4a9067e9f8cf5637be4f2da886cff35669 100644
|
| --- a/webkit/support/test_media_stream_client.cc
|
| +++ b/webkit/support/test_media_stream_client.cc
|
| @@ -6,7 +6,6 @@
|
|
|
| #include "googleurl/src/gurl.h"
|
| #include "media/base/pipeline.h"
|
| -#include "media/filters/video_frame_generator.h"
|
| #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStream.h"
|
| #include "third_party/WebKit/Source/Platform/chromium/public/WebMediaStreamTrack.h"
|
| #include "third_party/WebKit/Source/Platform/chromium/public/WebVector.h"
|
| @@ -59,21 +58,6 @@ TestMediaStreamClient::GetVideoFrameProvider(
|
| repaint_cb);
|
| }
|
|
|
| -scoped_refptr<media::VideoDecoder> TestMediaStreamClient::GetVideoDecoder(
|
| - const GURL& url,
|
| - const scoped_refptr<base::MessageLoopProxy>& message_loop) {
|
| - // This class is installed in a chain of possible VideoDecoder creators
|
| - // which are called in order until one returns an object.
|
| - // Make sure we are dealing with a Mock MediaStream. If not, bail out.
|
| - if (!IsMockMediaStreamWithVideo(url))
|
| - return NULL;
|
| -
|
| - return new media::VideoFrameGenerator(
|
| - message_loop,
|
| - gfx::Size(kVideoCaptureWidth, kVideoCaptureHeight),
|
| - base::TimeDelta::FromMilliseconds(kVideoCaptureFrameDurationMs));
|
| -}
|
| -
|
| scoped_refptr<webkit_media::MediaStreamAudioRenderer>
|
| TestMediaStreamClient::GetAudioRenderer(const GURL& url) {
|
| return NULL;
|
|
|