Chromium Code Reviews| Index: content/renderer/media/video_source_handler.h |
| diff --git a/content/renderer/media/video_source_handler.h b/content/renderer/media/video_source_handler.h |
| index 7337d804fbcce8a6176f6ef0b695333768990fdd..ead167a0a5b6e7100740487a202ccac63c3e9f07 100644 |
| --- a/content/renderer/media/video_source_handler.h |
| +++ b/content/renderer/media/video_source_handler.h |
| @@ -9,6 +9,7 @@ |
| #include <string> |
| #include "base/compiler_specific.h" |
| +#include "base/gtest_prod_util.h" |
| #include "base/memory/ref_counted.h" |
| #include "base/memory/scoped_ptr.h" |
| #include "base/threading/thread_checker.h" |
| @@ -50,22 +51,24 @@ class CONTENT_EXPORT VideoSourceHandler { |
| // Returns true on success and false on failure. |
| bool Close(FrameReaderInterface* reader); |
| - // Gets the MediaStreamVideoSink associated with |reader|. |
| - // Made it public only for testing purpose. |
| - MediaStreamVideoSink* GetReceiver(FrameReaderInterface* reader); |
| - |
| private: |
| + FRIEND_TEST_ALL_PREFIXES(VideoSourceHandlerTest, OpenClose); |
| + |
| struct SourceInfo { |
| SourceInfo(const blink::WebMediaStreamTrack& blink_track, |
| FrameReaderInterface* reader); |
| ~SourceInfo(); |
| scoped_ptr<PpFrameReceiver> receiver_; |
| - blink::WebMediaStreamTrack track_; |
| }; |
| typedef std::map<FrameReaderInterface*, SourceInfo*> SourceInfoMap; |
| + // Deliver VideoFrame to the MediaStreamVideoSink associated with |
| + // |reader|. For testing only. |
| + void DeliverFrameForTesting(FrameReaderInterface* reader, |
|
perkj_chrome
2014/05/08 08:15:08
Prefer to make this protected and create a test cl
Alpha Left Google
2014/05/08 18:45:51
There's already VideoSourceHandlerTest in the unit
perkj_chrome
2014/05/08 19:14:04
See for example media_stream_remote_video_source_u
|
| + const scoped_refptr<media::VideoFrame>& frame); |
| + |
| blink::WebMediaStreamTrack GetFirstVideoTrack(const std::string& url); |
| MediaStreamRegistryInterface* registry_; |
| @@ -79,4 +82,3 @@ class CONTENT_EXPORT VideoSourceHandler { |
| } // namespace content |
| #endif // CONTENT_RENDERER_MEDIA_VIDEO_SOURCE_HANDLER_H_ |
| - |