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

remoting/protocol/client_event_dispatcher.cc

 // 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.
 
 #include "remoting/protocol/client_event_dispatcher.h"
 
 #include "base/message_loop_proxy.h"
 #include "base/time.h"
+#include "net/socket/stream_socket.h"
+#include "remoting/base/constants.h"
 #include "remoting/proto/event.pb.h"
 #include "remoting/proto/internal.pb.h"
 #include "remoting/protocol/buffered_socket_writer.h"
-#include "remoting/protocol/session.h"
 #include "remoting/protocol/util.h"
 
 namespace remoting {
 namespace protocol {
 
 ClientEventDispatcher::ClientEventDispatcher()
-    : writer_(new BufferedSocketWriter(base::MessageLoopProxy::current())) {
+    : ChannelDispatcherBase(kEventChannelName),
+      writer_(new BufferedSocketWriter(base::MessageLoopProxy::current())) {
 }
 
 ClientEventDispatcher::~ClientEventDispatcher() {
   writer_->Close();
 }
 
-void ClientEventDispatcher::Init(Session* session) {
-  DCHECK(session);
-
+void ClientEventDispatcher::OnInitialized() {
   // TODO(garykac): Set write failed callback.
-  writer_->Init(session->event_channel(),
+  writer_->Init(channel(),
                 BufferedSocketWriter::WriteFailedCallback());
 }
 
 void ClientEventDispatcher::InjectKeyEvent(const KeyEvent& event) {
   EventMessage message;
   message.set_sequence_number(base::Time::Now().ToInternalValue());
   message.mutable_key_event()->CopyFrom(event);
   writer_->Write(SerializeAndFrameMessage(message), base::Closure());
 }
 
 void ClientEventDispatcher::InjectMouseEvent(const MouseEvent& event) {
   EventMessage message;
   message.set_sequence_number(base::Time::Now().ToInternalValue());
   message.mutable_mouse_event()->CopyFrom(event);
   writer_->Write(SerializeAndFrameMessage(message), base::Closure());
 }
 
 }  // namespace protocol
 }  // namespace remoting