Simplify VideoReader and VideoWriter

remoting/protocol/connection_to_host.h

 // Copyright (c) 2012 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_PROTOCOL_CONNECTION_TO_HOST_H_
 #define REMOTING_PROTOCOL_CONNECTION_TO_HOST_H_
 
 #include <set>
 #include <string>
 
@@ skipping 24 matching lines @@
 class AudioStub;
 class Authenticator;
 class ClientControlDispatcher;
 class ClientEventDispatcher;
 class ClientStub;
 class ClipboardStub;
 class HostStub;
 class InputStub;
 class SessionConfig;
 class TransportFactory;
-class VideoReader;
+class ClientVideoDispatcher;
 class VideoStub;
 
 class ConnectionToHost : public SignalStrategy::Listener,
                          public SessionManager::Listener,
                          public Session::EventHandler,
                          public base::NonThreadSafe {
  public:
   // The UI implementations maintain corresponding definitions of this
   // enumeration in webapp/client_session.js and
   // android/java/src/org/chromium/chromoting/jni/JniInterface.java. Be sure to
@@ skipping 110 matching lines @@
   // Stub for incoming messages.
   ClientStub* client_stub_;
   ClipboardStub* clipboard_stub_;
   AudioStub* audio_stub_;
 
   SignalStrategy* signal_strategy_;
   scoped_ptr<SessionManager> session_manager_;
   scoped_ptr<Session> session_;
   scoped_ptr<MonitoredVideoStub> monitored_video_stub_;
 
-  scoped_ptr<VideoReader> video_reader_;
+  scoped_ptr<ClientVideoDispatcher> video_dispatcher_;
   scoped_ptr<AudioReader> audio_reader_;
   scoped_ptr<ClientControlDispatcher> control_dispatcher_;
   scoped_ptr<ClientEventDispatcher> event_dispatcher_;
   ClipboardFilter clipboard_forwarder_;
   InputFilter event_forwarder_;
 
   // Internal state of the connection.
   State state_;
   ErrorCode error_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ConnectionToHost);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_CONNECTION_TO_HOST_H_