Move the routing-info inside the jingle element.

Move the routing-info inside the jingle element.

Previously, routing info are encoded in the iq node.  When the host is
offline, the talk network responds with an error IQ that doesn't get
relayed to the client because it doesn't have the routing info that the
signaling service needs.

Since an error IQ always contain the original request, by moving the
routing info inside the original jingle request, we can reliably route
the error message back to the client.

Review-Url: https://codereview.chromium.org/2042513002
Cr-Commit-Position: refs/heads/master@{#398383}
(cherry picked from commit 046534d38813b82d7f3bcb61b7f8c2fdc7f9cc74)

BUG=618143
Committed: https://chromium.googlesource.com/chromium/src/+/cbc9d492a9b1369b4db5715612c7c9170ac20fbe

[kelvinp, 2016-06-11 00:20:53]

Description was changed from

==========
Move the routing-info inside the jingle element.

Previously, routing info are encoded in the iq node.  When the host is
offline, the talk network responds with an error IQ that doesn't get
relayed to the client because it doesn't have the routing info that the
signaling service needs.

Since an error IQ always contain the original request, by moving the
routing info inside the original jingle request, we can reliably route
the error message back to the client.

Review-Url: https://codereview.chromium.org/2042513002
Cr-Commit-Position: refs/heads/master@{#398383}
(cherry picked from commit 046534d38813b82d7f3bcb61b7f8c2fdc7f9cc74)

BUG=618143
==========

to

==========
Move the routing-info inside the jingle element.

Previously, routing info are encoded in the iq node.  When the host is
offline, the talk network responds with an error IQ that doesn't get
relayed to the client because it doesn't have the routing info that the
signaling service needs.

Since an error IQ always contain the original request, by moving the
routing info inside the original jingle request, we can reliably route
the error message back to the client.

Review-Url: https://codereview.chromium.org/2042513002
Cr-Commit-Position: refs/heads/master@{#398383}
(cherry picked from commit 046534d38813b82d7f3bcb61b7f8c2fdc7f9cc74)

BUG=618143

Committed:
https://chromium.googlesource.com/chromium/src/+/cbc9d492a9b1369b4db5715612c7...
==========

[kelvinp, 2016-06-11 00:20:55]

Committed patchset #1 (id:1) manually as
cbc9d492a9b1369b4db5715612c7c9170ac20fbe.