Cast: deliver video frames on the IO thread

content/renderer/media/video_source_handler.h

 // Copyright (c) 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #ifndef CONTENT_RENDERER_MEDIA_VIDEO_SOURCE_HANDLER_H_
 #define CONTENT_RENDERER_MEDIA_VIDEO_SOURCE_HANDLER_H_
 
 #include <map>
 #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"
 #include "content/common/content_export.h"
 #include "media/base/video_frame.h"
 #include "third_party/WebKit/public/platform/WebMediaStreamTrack.h"
 
 namespace content {
 
 class MediaStreamRegistryInterface;
@@ skipping 21 matching lines @@
   virtual ~VideoSourceHandler();
   // Connects to the first video track in the MediaStream specified by |url| and
   // the received frames will be delivered via |reader|.
   // Returns true on success and false on failure.
   bool Open(const std::string& url, FrameReaderInterface* reader);
   // Closes |reader|'s connection with the video track, i.e. stops receiving
   // frames from the video track.
   // 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);
 
- private:
   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 class 

VideoSourceHandlerForTest : public VideoSourceHandler {
public:
using VideoSourceHandler::DeliverFrameForTesting
...


Remove FRIEND_TEST_ALL_PREFIXES(VideoSourceHandlerTest, OpenClose);

[Alpha Left Google, 2014/05/08 18:45:51]

There's already VideoSourceHandlerTest in the unit test. I would prefer to keep
this design because it's the main point of this patch.

[perkj_chrome, 2014/05/08 19:14:04]

See for example media_stream_remote_video_source_unittest.cc
class MediaStreamRemoteVideoSourceUnderTest
    : public MediaStreamRemoteVideoSource {
 public:
 using MediaStreamRemoteVideoSource::RenderInterfaceForTest;
};

+                              const scoped_refptr<media::VideoFrame>& frame);
+
   blink::WebMediaStreamTrack GetFirstVideoTrack(const std::string& url);
 
   MediaStreamRegistryInterface* registry_;
   SourceInfoMap reader_to_receiver_;
 
   base::ThreadChecker thread_checker_;
 
   DISALLOW_COPY_AND_ASSIGN(VideoSourceHandler);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_MEDIA_VIDEO_SOURCE_HANDLER_H_
-