Remove event_channel() and control_channel() from Session interface.

remoting/protocol/connection_to_client.h

Index: remoting/protocol/connection_to_client.h
diff --git a/remoting/protocol/connection_to_client.h b/remoting/protocol/connection_to_client.h
index 418e0711fb6f5224ce137a396d21a013167c6a0e..05503a2a769a0913e7efc4ed064a215c51df9f4b 100644
--- a/remoting/protocol/connection_to_client.h
+++ b/remoting/protocol/connection_to_client.h
@@ -84,8 +84,10 @@ class ConnectionToClient : public base::NonThreadSafe {
   // Callback for protocol Session.
   void OnSessionStateChange(Session::State state);
 
-  // Callback for VideoReader::Init().
-  void OnVideoInitialized(bool successful);
+  // Callbacks for channel initialization.
+  void OnControlChannelInitialized(bool successful);
+  void OnEventChannelInitialized(bool successful);
+  void OnVideoChannelInitialized(bool successful);
 
   void NotifyIfChannelsReady();
 
@@ -104,14 +106,14 @@ class ConnectionToClient : public base::NonThreadSafe {
   // The libjingle channel used to send and receive data from the remote client.
   scoped_ptr<Session> session_;
 
-  scoped_ptr<VideoWriter> video_writer_;
   scoped_ptr<HostControlDispatcher> control_dispatcher_;
-  scoped_ptr<HostEventDispatcher> input_dispatcher_;
+  scoped_ptr<HostEventDispatcher> event_dispatcher_;
+  scoped_ptr<VideoWriter> video_writer_;
 
   // State of the channels.
-  bool control_connected_;
-  bool input_connected_;
-  bool video_connected_;
+  bool control_channel_connected_;
+  bool event_channel_connected_;
+  bool video_channel_connected_;
 
   DISALLOW_COPY_AND_ASSIGN(ConnectionToClient);
 };