Remove legacy version of the control channel protocol.

remoting/protocol/session_config.cc

Index: remoting/protocol/session_config.cc
diff --git a/remoting/protocol/session_config.cc b/remoting/protocol/session_config.cc
index 3f2c911b0c1db8da62e43a9f0e4a6c4d1d2aed39..06936276d0b015e7102bd69b2fbb826e841a85b3 100644
--- a/remoting/protocol/session_config.cc
+++ b/remoting/protocol/session_config.cc
@@ -10,10 +10,7 @@ namespace remoting {
 namespace protocol {
 
 const int kDefaultStreamVersion = 2;

[Wez, 2014/09/13 17:21:41]

nit: Add a comment to explain what "default" means in this context (i.e. all
channels except control).

-
-// The control channel version that supports the "capabilities" message.
 const int kControlStreamVersion = 3;
-const int kControlStreamVersionNoCapabilities = kDefaultStreamVersion;
 
 ChannelConfig ChannelConfig::None() {
   return ChannelConfig();
@@ -41,10 +38,6 @@ bool ChannelConfig::operator==(const ChannelConfig& b) const {
 SessionConfig::SessionConfig() {
 }
 
-bool SessionConfig::SupportsCapabilities() const {
-  return control_config_.version >= kControlStreamVersion;
-}
-
 // static
 SessionConfig SessionConfig::ForTest() {
   SessionConfig result;
@@ -180,10 +173,6 @@ scoped_ptr<CandidateSessionConfig> CandidateSessionConfig::CreateDefault() {
       ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
                     kControlStreamVersion,
                     ChannelConfig::CODEC_UNDEFINED));
-  result->mutable_control_configs()->push_back(
-      ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
-                    kControlStreamVersionNoCapabilities,
-                    ChannelConfig::CODEC_UNDEFINED));
 
   // Event channel.
   result->mutable_event_configs()->push_back(