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

remoting/protocol/session.h

Index: remoting/protocol/session.h
diff --git a/remoting/protocol/session.h b/remoting/protocol/session.h
index 32e2de9ed4dda9c3b8ba1f038cacaec1c7e3b84e..603f7335cbd54ba020dbc72c40370ecbc9467716 100644
--- a/remoting/protocol/session.h
+++ b/remoting/protocol/session.h
@@ -41,10 +41,6 @@ class Session : public base::NonThreadSafe {
     // Session has been accepted, but channels are connected yet.
     CONNECTED,
 
-    // Video and control channels are connected.
-    // TODO(sergeyu): Remove this state.
-    CONNECTED_CHANNELS,
-
     // Session has been closed.
     CLOSED,
 
@@ -95,11 +91,6 @@ class Session : public base::NonThreadSafe {
   // completed then cancelling it has no effect.
   virtual void CancelChannelCreation(const std::string& name) = 0;
 
-  // TODO(sergeyu): Remove these methods, and use CreateChannel()
-  // instead.
-  virtual net::Socket* control_channel() = 0;
-  virtual net::Socket* event_channel() = 0;
-
   // JID of the other side.
   virtual const std::string& jid() = 0;