Libjingle roll 129:132.

Also update P2PPortAllocator for compatibility with the latest libjingle
changes.

BUG=121613

Review URL: https://chromiumcodereview.appspot.com/10069046

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@132307 0039d316-1c4b-4281-b951-d872f2087c98

5 files changed, 24 insertions, 15 deletions

diff --git a/DEPS b/DEPS
index 59352d3..a8676fc 100644
--- a/DEPS
+++ b/DEPS
@@ -41,7 +41,7 @@ vars = {
   "nacl_toolchain_revision": "8169",
   "pnacl_toolchain_revision": "8169",
 
-  "libjingle_revision": "128",
+  "libjingle_revision": "132",
   "libphonenumber_revision": "425",
   "libvpx_revision": "125647",
   "lss_revision": "9",
diff --git a/content/renderer/p2p/port_allocator.cc b/content/renderer/p2p/port_allocator.cc
index b58dea2..b22a88b 100644
--- a/content/renderer/p2p/port_allocator.cc
+++ b/content/renderer/p2p/port_allocator.cc
@@ -126,7 +126,7 @@ void P2PPortAllocatorSession::GetPortConfigurations() {
   // Add an empty configuration synchronously, so a local connection
   // can be started immediately.
   ConfigReady(new cricket::PortConfiguration(
-      talk_base::SocketAddress(), "", "", ""));
+      talk_base::SocketAddress(), username(), password(), ""));
 
   ResolveStunServerAddress();
   AllocateRelaySession();
@@ -193,7 +193,9 @@ void P2PPortAllocatorSession::AllocateRelaySession() {
   }
 
   std::string url = "https://" + allocator_->config_.relay_server +
-      kCreateRelaySessionURL;
+      kCreateRelaySessionURL +
+      "?username=" + net::EscapeUrlEncodedData(username(), true) +
+      "&password=" + net::EscapeUrlEncodedData(password(), true);
 
   // Use |relay_username| parameter to identify type of client for the
   // relay session.
@@ -203,7 +205,7 @@ void P2PPortAllocatorSession::AllocateRelaySession() {
   // is currently used for Chromoting only. This code should be removed
   // once Chromoting stops using Transport API and the API is removed.
   if (!allocator_->config_.relay_username.empty()) {
-    url += "?sn=" +
+    url += "&sn=" +
         net::EscapeUrlEncodedData(allocator_->config_.relay_username, true);
   }
 
@@ -235,8 +237,6 @@ void P2PPortAllocatorSession::ParseRelayResponse() {
     return;
   }
 
-  relay_username_.clear();
-  relay_password_.clear();
   relay_ip_.Clear();
   relay_udp_port_ = 0;
   relay_tcp_port_ = 0;
@@ -251,9 +251,17 @@ void P2PPortAllocatorSession::ParseRelayResponse() {
     TrimWhitespaceASCII(it->second, TRIM_ALL, &value);
 
     if (key == "username") {
-      relay_username_ = value;
+      if (value != username()) {
+        LOG(ERROR) << "When creating relay session received user name "
+            " that was different from the value specified in the query.";
+        return;
+      }
     } else if (key == "password") {
-      relay_password_ = value;
+      if (value != password()) {
+        LOG(ERROR) << "When creating relay session received password "
+            "that was different from the value specified in the query.";
+        return;
+      }
     } else if (key == "relay.ip") {
       relay_ip_.SetIP(value);
       if (relay_ip_.ip() == 0) {
@@ -278,7 +286,7 @@ void P2PPortAllocatorSession::ParseRelayResponse() {
 void P2PPortAllocatorSession::AddConfig() {
   cricket::PortConfiguration* config =
       new cricket::PortConfiguration(stun_server_address_,
-                                     relay_username_, relay_password_, "");
+                                     username(), password(), "");
 
   if (relay_ip_.ip() != 0) {
     cricket::PortConfiguration::PortList ports;
diff --git a/content/renderer/p2p/port_allocator.h b/content/renderer/p2p/port_allocator.h
index 7f2ab4b..350d876 100644
--- a/content/renderer/p2p/port_allocator.h
+++ b/content/renderer/p2p/port_allocator.h
@@ -1,4 +1,4 @@
-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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.
 
@@ -87,8 +87,6 @@ class P2PPortAllocatorSession : public cricket::BasicPortAllocatorSession,
   scoped_ptr<WebKit::WebURLLoader> relay_session_request_;
   int relay_session_attempts_;
   std::string relay_session_response_;
-  std::string relay_username_;
-  std::string relay_password_;
   talk_base::SocketAddress relay_ip_;
   int relay_udp_port_;
   int relay_tcp_port_;
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium
index 46633b5..efd5f22 100644
--- a/third_party/libjingle/README.chromium
+++ b/third_party/libjingle/README.chromium
@@ -2,7 +2,7 @@ Name: Libjingle library. Used for p2p voice and video communication.
 Short Name: libjingle
 URL: http://code.google.com/p/libjingle/
 Version: 0.6.17
-Revision: 126
+Revision: 132
 License: BSD
 License File: source/COPYING
 Security Critical: yes
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 4491d27..e41a569 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -285,6 +285,8 @@
         'source/talk/base/ssladapter.h',
         'source/talk/base/sslsocketfactory.cc',
         'source/talk/base/sslsocketfactory.h',
+        'source/talk/base/sslstreamadapter.cc',
+        'source/talk/base/sslstreamadapter.h',
         'source/talk/base/stream.cc',
         'source/talk/base/stream.h',
         'source/talk/base/stringencode.cc',
@@ -376,8 +378,6 @@
             'source/talk/base/openssladapter.h',
             'source/talk/base/openssldigest.cc',
             'source/talk/base/openssldigest.h',
-            'source/talk/base/sslstreamadapter.cc',
-            'source/talk/base/sslstreamadapter.h',
             'source/talk/base/unixfilesystem.cc',
             'source/talk/base/unixfilesystem.h',
           ],
@@ -426,6 +426,9 @@
         'source/talk/p2p/base/common.h',
         'source/talk/p2p/base/constants.cc',
         'source/talk/p2p/base/constants.h',
+        'source/talk/p2p/base/dtlstransport.h',
+        'source/talk/p2p/base/dtlstransportchannel.cc',
+        'source/talk/p2p/base/dtlstransportchannel.h',
         'source/talk/p2p/base/p2ptransport.cc',
         'source/talk/p2p/base/p2ptransport.h',
         'source/talk/p2p/base/p2ptransportchannel.cc',