Revert of Use standard ICE in Chromoting.

remoting/protocol/jingle_messages_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/jingle_messages.h"
 
 #include "base/logging.h"
 #include "testing/gmock/include/gmock/gmock.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "third_party/webrtc/libjingle/xmllite/xmlelement.h"
@@ skipping 87 matching lines @@
 TEST(JingleMessageTest, SessionInitiate) {
   const char* kTestSessionInitiateMessage =
       "<iq to='user@gmail.com/chromoting016DBB07' type='set' "
         "from='user@gmail.com/chromiumsy5C6A652D' "
         "xmlns='jabber:client'>"
         "<jingle xmlns='urn:xmpp:jingle:1' "
           "action='session-initiate' sid='2227053353' "
           "initiator='user@gmail.com/chromiumsy5C6A652D'>"
           "<content name='chromoting' creator='initiator'>"
             "<description xmlns='google:remoting'>"
-              "<standard-ice/>"
               "<control transport='stream' version='2'/>"
               "<event transport='stream' version='2'/>"
               "<video transport='stream' version='2' codec='vp8'/>"
               "<audio transport='stream' version='2' codec='verbatim'/>"
               "<initial-resolution width='640' height='480'/>"
               "<authentication><auth-token>"
                 "j7whCMii0Z0AAPwj7whCM/j7whCMii0Z0AAPw="
               "</auth-token></authentication>"
           "</description>"
           "<transport xmlns='http://www.google.com/transport/p2p'/>"
@@ skipping 15 matching lines @@
   scoped_ptr<XmlElement> formatted_message(message.ToXml());
   ASSERT_TRUE(formatted_message.get());
   EXPECT_TRUE(VerifyXml(formatted_message.get(), source_message.get(), &error))
       << error;
 }
 
 TEST(JingleMessageTest, SessionAccept) {
   const char* kTestSessionAcceptMessage =
       "<cli:iq from='user@gmail.com/chromoting016DBB07' "
         "to='user@gmail.com/chromiumsy5C6A652D' type='set' "
-        "xmlns:cli='jabber:client'>"
-        "<jingle action='session-accept' sid='2227053353' "
-          "xmlns='urn:xmpp:jingle:1'>i"
-          "<content creator='initiator' name='chromoting'>"
-            "<description xmlns='google:remoting'>"
-              "<standard-ice/>"
-              "<control transport='stream' version='2'/>"
-              "<event transport='stream' version='2'/>"
-              "<video codec='vp8' transport='stream' version='2'/>"
-              "<audio transport='stream' version='2' codec='verbatim'/>"
-              "<initial-resolution height='480' width='640'/>"
-              "<authentication><certificate>"
-                "MIICpjCCAY6gW0Cert0TANBgkqhkiG9w0BAQUFA="
-              "</certificate></authentication>"
-            "</description>"
-            "<transport xmlns='http://www.google.com/transport/p2p'/>"
-          "</content>"
-        "</jingle>"
-      "</cli:iq>";
-
-  scoped_ptr<XmlElement> source_message(
-      XmlElement::ForStr(kTestSessionAcceptMessage));
-  ASSERT_TRUE(source_message.get());
-
-  EXPECT_TRUE(JingleMessage::IsJingleMessage(source_message.get()));
-
-  JingleMessage message;
-  std::string error;
-  EXPECT_TRUE(message.ParseXml(source_message.get(), &error)) << error;
-
-  EXPECT_EQ(message.action, JingleMessage::SESSION_ACCEPT);
-
-  scoped_ptr<XmlElement> formatted_message(message.ToXml());
-  ASSERT_TRUE(formatted_message.get());
-  EXPECT_TRUE(VerifyXml(source_message.get(), formatted_message.get(), &error))
-      << error;
-}
-
-TEST(JingleMessageTest, SessionAcceptNoIce) {
-  const char* kTestSessionAcceptMessage =
-      "<cli:iq from='user@gmail.com/chromoting016DBB07' "
-        "to='user@gmail.com/chromiumsy5C6A652D' type='set' "
         "xmlns:cli='jabber:client'>"
         "<jingle action='session-accept' sid='2227053353' "
           "xmlns='urn:xmpp:jingle:1'>i"
           "<content creator='initiator' name='chromoting'>"
             "<description xmlns='google:remoting'>"
               "<control transport='stream' version='2'/>"
               "<event transport='stream' version='2'/>"
               "<video codec='vp8' transport='stream' version='2'/>"
               "<audio transport='stream' version='2' codec='verbatim'/>"
               "<initial-resolution height='480' width='640'/>"
@@ skipping 17 matching lines @@
   EXPECT_TRUE(message.ParseXml(source_message.get(), &error)) << error;
 
   EXPECT_EQ(message.action, JingleMessage::SESSION_ACCEPT);
 
   scoped_ptr<XmlElement> formatted_message(message.ToXml());
   ASSERT_TRUE(formatted_message.get());
   EXPECT_TRUE(VerifyXml(source_message.get(), formatted_message.get(), &error))
       << error;
 }
 
-TEST(JingleMessageTest, IceTransportInfo) {
-  const char* kTestIceTransportInfoMessage =
+TEST(JingleMessageTest, TransportInfo) {
+  const char* kTestTransportInfoMessage =
       "<cli:iq to='user@gmail.com/chromoting016DBB07' type='set' "
-              "xmlns:cli='jabber:client'>"
-        "<jingle xmlns='urn:xmpp:jingle:1' action='transport-info' "
-                "sid='2227053353'>"
-          "<content name='chromoting' creator='initiator'>"
-            "<transport xmlns='google:remoting:ice'>"
-              "<credentials channel='event' ufrag='tPUyEAmQrEw3y7hi' "
-                           "password='2iRdhLfawKZC5ydJ'/>"
-              "<credentials channel='video' ufrag='EPK3CXo5sTLJSez0' "
-                           "password='eM0VUfUkZ+1Pyi0M'/>"
-              "<candidate name='event' foundation='725747215' "
-                         "address='172.23.164.186' port='59089' type='local' "
-                         "protocol='udp' priority='2122194688' generation='0'/>"
-              "<candidate name='video' foundation='3623806809' "
-                         "address='172.23.164.186' port='57040' type='local' "
-                         "protocol='udp' priority='2122194688' generation='0'/>"
-            "</transport>"
-          "</content>"
-        "</jingle>"
-      "</cli:iq>";
+      "xmlns:cli='jabber:client'><jingle xmlns='urn:xmpp:jingle:1' "
+      "action='transport-info' sid='2227053353'><content name='chromoting' "
+      "creator='initiator'><transport "
+      "xmlns='http://www.google.com/transport/p2p'><candidate name='event' "
+      "address='172.23.164.186' port='57040' preference='1' "
+      "username='tPUyEAmQrEw3y7hi' protocol='udp' generation='0' "
+      "password='2iRdhLfawKZC5ydJ' type='local'/><candidate name='video' "
+      "address='172.23.164.186' port='42171' preference='1' "
+      "username='EPK3CXo5sTLJSez0' protocol='udp' generation='0' "
+      "password='eM0VUfUkZ+1Pyi0M' type='local'/></transport></content>"
+      "</jingle></cli:iq>";
 
   scoped_ptr<XmlElement> source_message(
-      XmlElement::ForStr(kTestIceTransportInfoMessage));
+      XmlElement::ForStr(kTestTransportInfoMessage));
   ASSERT_TRUE(source_message.get());
 
   EXPECT_TRUE(JingleMessage::IsJingleMessage(source_message.get()));
-
-  JingleMessage message;
-  std::string error;
-  EXPECT_TRUE(message.ParseXml(source_message.get(), &error)) << error;
-
-  EXPECT_EQ(message.action, JingleMessage::TRANSPORT_INFO);
-  EXPECT_EQ(message.candidates.size(), 2U);
-
-  scoped_ptr<XmlElement> formatted_message(message.ToXml());
-  ASSERT_TRUE(formatted_message.get());
-  EXPECT_TRUE(VerifyXml(source_message.get(), formatted_message.get(), &error))
-      << error;
-}
-
-TEST(JingleMessageTest, GiceTransportInfo) {
-  const char* kTestGiceTransportInfoMessage =
-      "<cli:iq to='user@gmail.com/chromoting016DBB07' type='set' "
-              "xmlns:cli='jabber:client'>"
-        "<jingle xmlns='urn:xmpp:jingle:1' action='transport-info' "
-                "sid='2227053353'>"
-          "<content name='chromoting' creator='initiator'>"
-            "<transport  xmlns='http://www.google.com/transport/p2p'>"
-              "<candidate name='event' address='172.23.164.186' port='57040' "
-                        "preference='1' username='tPUyEAmQrEw3y7hi' "
-                        "protocol='udp' generation='0' "
-                        "password='2iRdhLfawKZC5ydJ' type='local'/>"
-              "<candidate name='video' address='172.23.164.186' port='42171' "
-                         "preference='1' username='EPK3CXo5sTLJSez0' "
-                         "protocol='udp' generation='0' "
-                         "password='eM0VUfUkZ+1Pyi0M' type='local'/>"
-            "</transport>"
-          "</content>"
-        "</jingle>"
-      "</cli:iq>";
-
-  scoped_ptr<XmlElement> source_message(
-      XmlElement::ForStr(kTestGiceTransportInfoMessage));
-  ASSERT_TRUE(source_message.get());
-
-  EXPECT_TRUE(JingleMessage::IsJingleMessage(source_message.get()));
 
   JingleMessage message;
   std::string error;
   EXPECT_TRUE(message.ParseXml(source_message.get(), &error)) << error;
 
   EXPECT_EQ(message.action, JingleMessage::TRANSPORT_INFO);
   EXPECT_EQ(message.candidates.size(), 2U);
 
   scoped_ptr<XmlElement> formatted_message(message.ToXml());
   ASSERT_TRUE(formatted_message.get());
@@ skipping 155 matching lines @@
   EXPECT_FALSE(JingleMessage::IsJingleMessage(source_message.get()));
 
   JingleMessage message;
   std::string error;
   EXPECT_FALSE(message.ParseXml(source_message.get(), &error));
   EXPECT_FALSE(error.empty());
 }
 
 }  // namespace protocol
 }  // namespace remoting