Improve handling of NONE transport in channel configuration.

remoting/protocol/content_description_unittest.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/content_description.h"
 
 #include <string>
 
 #include "base/logging.h"
 #include "remoting/protocol/authenticator.h"
@@ skipping 19 matching lines @@
   EXPECT_TRUE(description.config()->video_configs() ==
               parsed->config()->video_configs());
   EXPECT_TRUE(description.config()->event_configs() ==
               parsed->config()->event_configs());
   EXPECT_TRUE(description.config()->audio_configs() ==
               parsed->config()->audio_configs());
 }
 
 // Verify that we can still parse configs with transports that we don't
 // recognize.
-TEST(ContentDescription, ParseUnknown) {
+TEST(ContentDescriptionTest, ParseUnknown) {
   std::string kTestDescription =
       "<description xmlns=\"google:remoting\">"
       "  <control transport=\"stream\" version=\"2\"/>"
       "  <event transport=\"stream\" version=\"2\"/>"
       "  <event transport=\"new_awesome_transport\" version=\"3\"/>"
       "  <video transport=\"stream\" version=\"2\" codec=\"vp8\"/>"
       "  <authentication/>"
       "</description>";
   scoped_ptr<buzz::XmlElement> xml(buzz::XmlElement::ForStr(kTestDescription));
   scoped_ptr<ContentDescription> parsed(
       ContentDescription::ParseXml(xml.get()));
   ASSERT_TRUE(parsed.get());
   EXPECT_EQ(1U, parsed->config()->event_configs().size());
   EXPECT_TRUE(parsed->config()->event_configs()[0] ==
               ChannelConfig(ChannelConfig::TRANSPORT_STREAM,
                             kDefaultStreamVersion,
                             ChannelConfig::CODEC_UNDEFINED));
 }
 
+// Verify that we can parse configs with none transport without version and
+// codec.
+TEST(ContentDescriptionTest, NoneTransport) {
+  std::string kTestDescription =
+      "<description xmlns=\"google:remoting\">"
+      "  <control transport=\"stream\" version=\"2\"/>"
+      "  <event transport=\"stream\" version=\"2\"/>"
+      "  <event transport=\"stream\" version=\"2\"/>"
+      "  <video transport=\"stream\" version=\"2\" codec=\"vp8\"/>"
+      "  <audio transport=\"none\"/>"
+      "  <authentication/>"
+      "</description>";
+  scoped_ptr<buzz::XmlElement> xml(buzz::XmlElement::ForStr(kTestDescription));
+  scoped_ptr<ContentDescription> parsed(
+      ContentDescription::ParseXml(xml.get()));
+  ASSERT_TRUE(parsed.get());
+  EXPECT_EQ(1U, parsed->config()->audio_configs().size());
+  EXPECT_TRUE(parsed->config()->audio_configs()[0] == ChannelConfig());
+}
+
+// Verify that we can parse configs with none transport with version and
+// codec.
+TEST(ContentDescriptionTest, NoneTransportWithCodec) {
+  std::string kTestDescription =
+      "<description xmlns=\"google:remoting\">"
+      "  <control transport=\"stream\" version=\"2\"/>"
+      "  <event transport=\"stream\" version=\"2\"/>"
+      "  <event transport=\"stream\" version=\"2\"/>"
+      "  <video transport=\"stream\" version=\"2\" codec=\"vp8\"/>"
+      "  <audio transport=\"none\" version=\"2\" codec=\"verbatim\"/>"
+      "  <authentication/>"
+      "</description>";
+  scoped_ptr<buzz::XmlElement> xml(buzz::XmlElement::ForStr(kTestDescription));
+  scoped_ptr<ContentDescription> parsed(
+      ContentDescription::ParseXml(xml.get()));
+  ASSERT_TRUE(parsed.get());
+  EXPECT_EQ(1U, parsed->config()->audio_configs().size());
+  EXPECT_TRUE(parsed->config()->audio_configs()[0] == ChannelConfig());
+}
+
 }  // namespace protocol
 }  // namespace remoting