Move the routing-info inside the jingle element.

remoting/protocol/jingle_messages_unittest.cc

Index: remoting/protocol/jingle_messages_unittest.cc
diff --git a/remoting/protocol/jingle_messages_unittest.cc b/remoting/protocol/jingle_messages_unittest.cc
index 50fb2f6b55ec0db5f8c8816c77cd0a4dc34ab787..70e1963ea3c168fb1ecb710ea3a9a4fc682737ae 100644
--- a/remoting/protocol/jingle_messages_unittest.cc
+++ b/remoting/protocol/jingle_messages_unittest.cc
@@ -403,15 +403,18 @@ TEST(JingleMessageTest, SessionInfo) {
               buzz::QName("urn:xmpp:jingle:1", "test-info"));
 }
 
-TEST(JingleMessageTest, Address) {
+TEST(JingleMessageTest, ParseAddress) {
   const char* kTestSessionInfoMessage =
       "<cli:iq from='remoting@talk.google.com' "
-      "from-channel='lcs' "
-      "from-endpoint-id='user@gmail.com/xBrnereror=' "
-      "to='user@gmail.com/chromiumsy5C6A652D' type='set' "
-      "xmlns:cli='jabber:client'><jingle action='session-info' "
-      "sid='2227053353' xmlns='urn:xmpp:jingle:1'><test-info>TestMessage"
-      "</test-info></jingle></cli:iq>";
+              "to='user@gmail.com/chromiumsy5C6A652D' type='set' "
+              "xmlns:cli='jabber:client'>"
+        "<jingle action='session-info' "
+                "sid='2227053353' xmlns='urn:xmpp:jingle:1' "
+                "from-channel='lcs' "
+                "from-endpoint-id='user@gmail.com/xBrnereror='>"
+          "<test-info>TestMessage</test-info>"
+        "</jingle>"
+      "</cli:iq>";
 
   JingleMessage message;
   ParseFormatAndCompare(kTestSessionInfoMessage, &message);
@@ -437,9 +440,9 @@ TEST(JingleMessageReplyTest, ToXml) {
       "</reason></jingle></cli:iq>";
   const char* kTestIncomingMessage2 =
       "<cli:iq from='remoting@talk.google.com' id='4' "
-      "from-channel='lcs' from-endpoint-id='from@gmail.com/AbCdEf1234=' "
       "to='user@gmail.com/chromiumsy5C6A652D' type='set' "
       "xmlns:cli='jabber:client'><jingle action='session-terminate' "
+      "from-channel='lcs' from-endpoint-id='from@gmail.com/AbCdEf1234=' "
       "sid='2227053353' xmlns='urn:xmpp:jingle:1'><reason><success/>"
       "</reason></jingle></cli:iq>";
 
@@ -493,17 +496,17 @@ TEST(JingleMessageReplyTest, ToXml) {
        kTestIncomingMessage1},
       {JingleMessageReply::INVALID_SID, "ErrorText",
        "<iq xmlns='jabber:client' "
-       "to='remoting@talk.google.com' to-channel='lcs' "
-       "to-endpoint-id='from@gmail.com/AbCdEf1234=' id='4' "
+       "to='remoting@talk.google.com' id='4' "
        "type='error'><jingle "
-       "action='session-terminate' sid='2227053353' xmlns='urn:xmpp:jingle:1'>"
+       "action='session-terminate' sid='2227053353' xmlns='urn:xmpp:jingle:1' "
+       "from-channel='lcs' from-endpoint-id='from@gmail.com/AbCdEf1234='>"
        "<reason><success/></reason></jingle><error type='modify'>"
        "<item-not-found/><text xml:lang='en'>ErrorText</text></error></iq>",
        kTestIncomingMessage2},
       {JingleMessageReply::NONE, "",
-       "<iq xmlns='jabber:client' "
-       "to='remoting@talk.google.com' to-channel='lcs' "
-       "to-endpoint-id='from@gmail.com/AbCdEf1234=' id='4' type='result'></iq>",
+       "<iq xmlns='jabber:client' to='remoting@talk.google.com' id='4' "
+       "type='result'><jingle xmlns='urn:xmpp:jingle:1' to-channel='lcs' "
+       "to-endpoint-id='from@gmail.com/AbCdEf1234='></jingle></iq>",

[Sergey Ulanov, 2016/06/04 17:10:31]

Nit: replace "></jingle>" with "/>"

[kelvinp, 2016/06/06 20:43:41]

Done.

        kTestIncomingMessage2},
   };
 
@@ -512,6 +515,7 @@ TEST(JingleMessageReplyTest, ToXml) {
         XmlElement::ForStr(tests[i].incoming_message));
     ASSERT_TRUE(incoming_message.get());
 
+    LOG(INFO) << "Running test case: " << i;

[Sergey Ulanov, 2016/06/04 17:10:31]

To avoid spamming the console, replace this with SCOPED_TRACE(i);

[kelvinp, 2016/06/06 20:43:41]

Done.

     JingleMessageReply reply_msg;
     if (tests[i].error_text.empty()) {
       reply_msg = JingleMessageReply(tests[i].error);