Improve handling of NONE transport in channel configuration.

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 9a151b984e423ecb68103287cb04f28121b6c836..f6b8cd56da55aa3c928b276f7a3fcef86ba98bc1 100644
--- a/remoting/protocol/session_config.cc
+++ b/remoting/protocol/session_config.cc
@@ -11,8 +11,10 @@ namespace protocol {
 
 const int kDefaultStreamVersion = 2;
 
-ChannelConfig::ChannelConfig() {
-  Reset();
+ChannelConfig::ChannelConfig()
+    : transport(TRANSPORT_NONE),
+      version(0),
+      codec(CODEC_UNDEFINED) {
 }
 
 ChannelConfig::ChannelConfig(TransportType transport, int version, Codec codec)
@@ -22,15 +24,12 @@ ChannelConfig::ChannelConfig(TransportType transport, int 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;
 }
 
-void ChannelConfig::Reset() {
-  transport = TRANSPORT_STREAM;
-  version = kDefaultStreamVersion;
-  codec = CODEC_UNDEFINED;
-}
-
 SessionConfig::SessionConfig() {
 }
 
@@ -191,10 +190,7 @@ scoped_ptr<CandidateSessionConfig> CandidateSessionConfig::CreateDefault() {
                     ChannelConfig::CODEC_VP8));
 
   // Audio channel.
-  result->mutable_audio_configs()->push_back(
-      ChannelConfig(ChannelConfig::TRANSPORT_NONE,
-                    kDefaultStreamVersion,
-                    ChannelConfig::CODEC_VERBATIM));
+  result->mutable_audio_configs()->push_back(ChannelConfig());
 #if defined(ENABLE_REMOTING_AUDIO)
   EnableAudioChannel(result.get());
 #endif  // defined(ENABLE_REMOTING_AUDIO)
@@ -214,10 +210,7 @@ void CandidateSessionConfig::EnableAudioChannel(
       ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
                     kDefaultStreamVersion,
                     ChannelConfig::CODEC_VERBATIM));
-  config->mutable_audio_configs()->push_back(
-      ChannelConfig(ChannelConfig::TRANSPORT_NONE,
-                    kDefaultStreamVersion,
-                    ChannelConfig::CODEC_VERBATIM));
+  config->mutable_audio_configs()->push_back(ChannelConfig());
 }
 
 }  // namespace protocol