Decompose VideoRenderer from VideoStub.

remoting/client/plugin/pepper_video_renderer_3d.h

 // Copyright 2014 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 REMOTING_CLIENT_PLUGIN_PEPPER_VIDEO_RENDERER_3D_H_
 #define REMOTING_CLIENT_PLUGIN_PEPPER_VIDEO_RENDERER_3D_H_
 
 #include <deque>
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/callback.h"
 #include "base/memory/scoped_ptr.h"
 #include "ppapi/cpp/graphics_3d.h"
 #include "ppapi/cpp/instance_handle.h"
 #include "ppapi/cpp/video_decoder.h"
 #include "ppapi/utility/completion_callback_factory.h"
 #include "remoting/client/chromoting_stats.h"
 #include "remoting/client/plugin/pepper_video_renderer.h"
+#include "remoting/protocol/video_stub.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_geometry.h"
 #include "third_party/webrtc/modules/desktop_capture/desktop_region.h"
 
 struct PPB_OpenGLES2;
 
 namespace remoting {
 
 // PepperVideoRenderer that uses the PPB_VideoDecoder interface for video
 // decoding and Graphics3D for rendering.
-class PepperVideoRenderer3D : public PepperVideoRenderer {
+class PepperVideoRenderer3D : public PepperVideoRenderer,
+                              public protocol::VideoStub {
  public:
   PepperVideoRenderer3D();
   ~PepperVideoRenderer3D() override;
 
   // PepperVideoRenderer interface.
   bool Initialize(pp::Instance* instance,
                   const ClientContext& context,
                   EventHandler* event_handler) override;
   void OnViewChanged(const pp::View& view) override;
+
+  // VideoRenderer interface.
   void OnSessionConfig(const protocol::SessionConfig& config) override;
   ChromotingStats* GetStats() override;
+  protocol::VideoStub* GetVideoStub() override;
+
+  // protocol::VideoStub interface.
   void ProcessVideoPacket(scoped_ptr<VideoPacket> packet,
                           const base::Closure& done) override;
 
  private:
   class PendingPacket;
   class Picture;
 
   struct FrameDecodeTimestamp {
     FrameDecodeTimestamp(uint32_t frame_id,
                          base::TimeTicks decode_started_time);
@@ skipping 92 matching lines @@
   int shader_texcoord_scale_location_;
 
   pp::CompletionCallbackFactory<PepperVideoRenderer3D> callback_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperVideoRenderer3D);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_CLIENT_PLUGIN_PEPPER_VIDEO_RENDERER_3D_H_