Remove legacy version of the control channel protocol.

remoting/protocol/session_config.cc

 // Copyright (c) 2012 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/session_config.h"
 
 #include <algorithm>
 
 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();
 }
 
 ChannelConfig::ChannelConfig()
     : transport(TRANSPORT_NONE),
       version(0),
       codec(CODEC_UNDEFINED) {
 }
 
 ChannelConfig::ChannelConfig(TransportType transport, int version, Codec codec)
     : transport(transport),
       version(version),
       codec(codec) {
 }
 
 bool ChannelConfig::operator==(const ChannelConfig& b) const {
   // If the transport field is set to NONE then all other fields are irrelevant.
   if (transport == ChannelConfig::TRANSPORT_NONE)
     return transport == b.transport;
   return transport == b.transport && version == b.version && codec == b.codec;
 }
 
 SessionConfig::SessionConfig() {
 }
 
-bool SessionConfig::SupportsCapabilities() const {
-  return control_config_.version >= kControlStreamVersion;
-}
-
 // static
 SessionConfig SessionConfig::ForTest() {
   SessionConfig result;
   result.set_control_config(ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
                                           kControlStreamVersion,
                                           ChannelConfig::CODEC_UNDEFINED));
   result.set_event_config(ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
                                         kDefaultStreamVersion,
                                         ChannelConfig::CODEC_UNDEFINED));
   result.set_video_config(ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
@@ skipping 115 matching lines @@
 
 // static
 scoped_ptr<CandidateSessionConfig> CandidateSessionConfig::CreateDefault() {
   scoped_ptr<CandidateSessionConfig> result = CreateEmpty();
 
   // Control channel.
   result->mutable_control_configs()->push_back(
       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(
       ChannelConfig(ChannelConfig::TRANSPORT_MUX_STREAM,
                     kDefaultStreamVersion,
                     ChannelConfig::CODEC_UNDEFINED));
 
   // Video channel.
 #if !defined(MEDIA_DISABLE_LIBVPX)
   result->mutable_video_configs()->push_back(
@@ skipping 19 matching lines @@
 
 void CandidateSessionConfig::EnableVideoCodec(ChannelConfig::Codec codec) {
   mutable_video_configs()->push_front(
       ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
                     kDefaultStreamVersion,
                     codec));
 }
 
 }  // namespace protocol
 }  // namespace remoting