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

remoting/protocol/connection_to_host.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_HOST_H_
 #define REMOTING_PROTOCOL_CONNECTION_TO_HOST_H_
 
 #include <string>
 
 #include "base/memory/ref_counted.h"
@@ skipping 99 matching lines @@
   State state() const;
 
  private:
   // Called on the jingle thread after we've successfully to XMPP server. Starts
   // P2P connection to the host.
   void InitSession();
 
   // Callback for |session_|.
   void OnSessionStateChange(Session::State state);
 
-  // Callback for VideoReader::Init().
+  // Callbacks for channel initialization
+  void OnControlChannelInitialized(bool successful);
+  void OnEventChannelInitialized(bool successful);
   void OnVideoChannelInitialized(bool successful);
 
   void NotifyIfChannelsReady();
 
   // Callback for |video_reader_|.
   void OnVideoPacket(VideoPacket* packet);
 
   void CloseOnError(Error error);
 
   // Stops writing in the channels.
@@ skipping 15 matching lines @@
   ClientStub* client_stub_;
   VideoStub* video_stub_;
 
   scoped_ptr<SignalStrategy> signal_strategy_;
   std::string local_jid_;
   scoped_ptr<SessionManager> session_manager_;
   scoped_ptr<Session> session_;
 
   scoped_ptr<VideoReader> video_reader_;
   scoped_ptr<ClientControlDispatcher> control_dispatcher_;
-  scoped_ptr<ClientEventDispatcher> input_dispatcher_;
+  scoped_ptr<ClientEventDispatcher> event_dispatcher_;
 
   // Internal state of the connection.
   State state_;
   Error error_;
 
   // 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_;
 
  private:
   DISALLOW_COPY_AND_ASSIGN(ConnectionToHost);
 };
 
 }  // namespace protocol
 }  // namespace remoting
 
 #endif  // REMOTING_PROTOCOL_CONNECTION_TO_HOST_H_