| Index: webkit/support/test_media_stream_client.h
|
| ===================================================================
|
| --- webkit/support/test_media_stream_client.h (revision 158069)
|
| +++ webkit/support/test_media_stream_client.h (working copy)
|
| @@ -9,28 +9,23 @@
|
| #ifndef WEBKIT_SUPPORT_TEST_MEDIA_STREAM_CLIENT_H_
|
| #define WEBKIT_SUPPORT_TEST_MEDIA_STREAM_CLIENT_H_
|
|
|
| +#include "base/callback_forward.h"
|
| #include "third_party/WebKit/Source/WebKit/chromium/public/platform/WebURL.h"
|
| #include "webkit/media/media_stream_client.h"
|
|
|
| namespace webkit_support {
|
|
|
| -// TODO(tommyw): Remove deprecated class after corresponding
|
| -// WebKit patch is committed.
|
| -class MediaStreamUtil {
|
| - public:
|
| - virtual bool IsMockStream(const WebKit::WebURL& url) = 0;
|
| -};
|
| -
|
| class TestMediaStreamClient : public webkit_media::MediaStreamClient {
|
| public:
|
| - // TODO(tommyw): Remove deprecated constructor after
|
| - // corresponding WebKit patch is committed.
|
| - explicit TestMediaStreamClient(MediaStreamUtil* media_stream_util) {}
|
| + TestMediaStreamClient();
|
| + virtual ~TestMediaStreamClient();
|
|
|
| - TestMediaStreamClient() {}
|
| - virtual ~TestMediaStreamClient() {}
|
| -
|
| // Implement webkit_media::MediaStreamClient.
|
| + virtual bool IsMediaStream(const GURL& url) OVERRIDE;
|
| + virtual scoped_refptr<webkit_media::VideoFrameProvider> GetVideoFrameProvider(
|
| + const GURL& url,
|
| + const base::Closure& error_cb,
|
| + const webkit_media::VideoFrameProvider::RepaintCB& repaint_cb) OVERRIDE;
|
| virtual scoped_refptr<media::VideoDecoder> GetVideoDecoder(
|
| const GURL& url,
|
| media::MessageLoopFactory* message_loop_factory) OVERRIDE;
|
|
|