Decompose VideoRenderer from VideoStub.

remoting/client/software_video_renderer.h

Index: remoting/client/software_video_renderer.h
diff --git a/remoting/client/software_video_renderer.h b/remoting/client/software_video_renderer.h
index 68434326723420aa9ac3245e53fb5c8eda2f93fb..11be6dc0eae679c7800a71911b722ed4798f1fb1 100644
--- a/remoting/client/software_video_renderer.h
+++ b/remoting/client/software_video_renderer.h
@@ -11,6 +11,7 @@
 #include "remoting/client/frame_consumer_proxy.h"
 #include "remoting/client/frame_producer.h"
 #include "remoting/client/video_renderer.h"
+#include "remoting/protocol/video_stub.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
 
 namespace base {
@@ -27,6 +28,7 @@ class ChromotingStats;
 // called on the main thread. Owned must ensure that this class outlives
 // FrameConsumer (which calls FrameProducer interface).
 class SoftwareVideoRenderer : public VideoRenderer,
+                              public protocol::VideoStub,
                               public FrameProducer,
                               public base::NonThreadSafe {
  public:
@@ -41,9 +43,12 @@ class SoftwareVideoRenderer : public VideoRenderer,
       scoped_refptr<FrameConsumerProxy> consumer);
   ~SoftwareVideoRenderer() override;
 
-  // VideoRenderer implementation.
+  // VideoRenderer interface.
   void OnSessionConfig(const protocol::SessionConfig& config) override;
   ChromotingStats* GetStats() override;
+  protocol::VideoStub* GetVideoStub() override;

[Sergey Ulanov, 2015/02/11 21:54:53]

I think you also need to add this method in software_video_renderer.cc

+
+  // protocol::VideoStub interface.
   void ProcessVideoPacket(scoped_ptr<VideoPacket> packet,
                           const base::Closure& done) override;