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

remoting/protocol/connection_to_client.h

 // Copyright (c) 2011 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_CLIENT_H_
 #define REMOTING_PROTOCOL_CONNECTION_TO_CLIENT_H_
 
 #include <deque>
 #include <vector>
 
@@ skipping 66 matching lines @@
   virtual ClientStub* client_stub();
 
   // These two setters should be called before Init().
   virtual void set_host_stub(HostStub* host_stub);
   virtual void set_input_stub(InputStub* input_stub);
 
  private:
   // 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();
 
   void CloseOnError();
 
   // Stops writing in the channels.
   void CloseChannels();
 
   // Event handler for handling events sent from this object.
   EventHandler* handler_;
 
   // Stubs that are called for incoming messages.
   HostStub* host_stub_;
   InputStub* input_stub_;
 
   // The libjingle channel used to send and receive data from the remote client.
   scoped_ptr<Session> session_;
 
+  scoped_ptr<HostControlDispatcher> control_dispatcher_;
+  scoped_ptr<HostEventDispatcher> event_dispatcher_;
   scoped_ptr<VideoWriter> video_writer_;
-  scoped_ptr<HostControlDispatcher> control_dispatcher_;
-  scoped_ptr<HostEventDispatcher> input_dispatcher_;
 
   // 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);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_CONNECTION_TO_CLIENT_H_