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

remoting/protocol/client_control_dispatcher.h

Index: remoting/protocol/client_control_dispatcher.h
diff --git a/remoting/protocol/client_control_dispatcher.h b/remoting/protocol/client_control_dispatcher.h
index 0fdb5092f2c374413107a9d6f7ec391fd781f57c..cd6dd47deccae02a4b6feb85141e4aabf29ca72a 100644
--- a/remoting/protocol/client_control_dispatcher.h
+++ b/remoting/protocol/client_control_dispatcher.h
@@ -5,8 +5,8 @@
 #ifndef REMOTING_PROTOCOL_CLIENT_CONTROL_DISPATCHER_H_
 #define REMOTING_PROTOCOL_CLIENT_CONTROL_DISPATCHER_H_
 
-#include "base/basictypes.h"
 #include "base/memory/ref_counted.h"
+#include "remoting/protocol/channel_dispatcher_base.h"
 #include "remoting/protocol/host_stub.h"
 #include "remoting/protocol/message_reader.h"
 
@@ -25,20 +25,20 @@ class Session;
 // ClientControlDispatcher dispatches incoming messages on the control
 // channel to ClientStub, and also implements HostStub for outgoing
 // messages.
-class ClientControlDispatcher : public HostStub {
+class ClientControlDispatcher : public ChannelDispatcherBase, public HostStub {
  public:
   ClientControlDispatcher();
   virtual ~ClientControlDispatcher();
 
-  // Initialize the control channel and the dispatcher for the
-  // |session|. Doesn't take ownership of |session|.
-  void Init(protocol::Session* session);
-
   // Sets ClientStub that will be called for each incoming control
   // message. Doesn't take ownership of |client_stub|. It must outlive
   // this dispatcher.
   void set_client_stub(ClientStub* client_stub) { client_stub_ = client_stub; }
 
+ protected:
+  // ChannelDispatcherBase overrides.
+  virtual void OnInitialized() OVERRIDE;
+
  private:
   void OnMessageReceived(ControlMessage* message,
                          const base::Closure& done_task);