Changes needed to roll libjingle r141 to chrome.

1. Setting ice username and password for P2PTransportChannel.
2. Updating XMPP Auth cookie with Auth Token

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

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

3 files changed, 26 insertions, 14 deletions

diff --git a/content/renderer/p2p/p2p_transport_impl.cc b/content/renderer/p2p/p2p_transport_impl.cc
index 9a67e67..7a13997 100644
--- a/content/renderer/p2p/p2p_transport_impl.cc
+++ b/content/renderer/p2p/p2p_transport_impl.cc
@@ -12,6 +12,8 @@
 #include "jingle/glue/thread_wrapper.h"
 #include "jingle/glue/utils.h"
 #include "net/base/net_errors.h"
+#include "third_party/libjingle/source/talk/base/helpers.h"
+#include "third_party/libjingle/source/talk/p2p/base/constants.h"
 #include "third_party/libjingle/source/talk/p2p/base/p2ptransportchannel.h"
 #include "third_party/libjingle/source/talk/p2p/client/basicportallocator.h"
 
@@ -75,7 +77,10 @@ bool P2PTransportImpl::Init(WebKit::WebFrame* web_frame,
 
   DCHECK(!channel_.get());
   channel_.reset(new cricket::P2PTransportChannel(
-      name, 0, NULL, allocator_.get()));
+      0, NULL, allocator_.get()));
+  channel_->SetIceUfrag(
+      talk_base::CreateRandomString(cricket::ICE_UFRAG_LENGTH));
+  channel_->SetIcePwd(talk_base::CreateRandomString(cricket::ICE_PWD_LENGTH));
   channel_->SignalRequestSignaling.connect(
       this, &P2PTransportImpl::OnRequestSignaling);
   channel_->SignalCandidateReady.connect(
diff --git a/content/renderer/p2p/port_allocator.cc b/content/renderer/p2p/port_allocator.cc
index 610f61b..a85c92d 100644
--- a/content/renderer/p2p/port_allocator.cc
+++ b/content/renderer/p2p/port_allocator.cc
@@ -70,17 +70,22 @@ P2PPortAllocator::P2PPortAllocator(
 P2PPortAllocator::~P2PPortAllocator() {
 }
 
-cricket::PortAllocatorSession* P2PPortAllocator::CreateSession(
-    const std::string& channel_name,
-    int component) {
-  return new P2PPortAllocatorSession(this, channel_name, component);
+cricket::PortAllocatorSession* P2PPortAllocator::CreateSessionInternal(
+    int component,
+    const std::string& ice_username_fragment,
+    const std::string& ice_password) {
+  return new P2PPortAllocatorSession(
+      this, component, ice_username_fragment, ice_password);
 }
 
 P2PPortAllocatorSession::P2PPortAllocatorSession(
     P2PPortAllocator* allocator,
-    const std::string& channel_name,
-    int component)
-    : cricket::BasicPortAllocatorSession(allocator, channel_name, component),
+    int component,
+    const std::string& ice_username_fragment,
+    const std::string& ice_password)
+    : cricket::BasicPortAllocatorSession(
+        allocator, component,
+        ice_username_fragment, ice_password),
       allocator_(allocator),
       relay_session_attempts_(0),
       relay_udp_port_(0),
@@ -221,7 +226,7 @@ void P2PPortAllocatorSession::AllocateRelaySession() {
       WebString::fromUTF8("X-Google-Relay-Auth"),
       WebString::fromUTF8(allocator_->config_.relay_password));
   request.addHTTPHeaderField(WebString::fromUTF8("X-Stream-Type"),
-                             WebString::fromUTF8(channel_name()));
+                             WebString::fromUTF8("chromoting"));
 
   relay_session_request_->loadAsynchronously(request, this);
 }
diff --git a/content/renderer/p2p/port_allocator.h b/content/renderer/p2p/port_allocator.h
index ab0198d..5aa34db 100644
--- a/content/renderer/p2p/port_allocator.h
+++ b/content/renderer/p2p/port_allocator.h
@@ -34,9 +34,10 @@ class P2PPortAllocator : public cricket::BasicPortAllocator {
                    const webkit_glue::P2PTransport::Config& config);
   virtual ~P2PPortAllocator();
 
-  virtual cricket::PortAllocatorSession* CreateSession(
-      const std::string& channel_name,
-      int component) OVERRIDE;
+  virtual cricket::PortAllocatorSession* CreateSessionInternal(
+      int component,
+      const std::string& ice_username_fragment,
+      const std::string& ice_password) OVERRIDE;
 
  private:
   friend class P2PPortAllocatorSession;
@@ -53,8 +54,9 @@ class P2PPortAllocatorSession : public cricket::BasicPortAllocatorSession,
  public:
   P2PPortAllocatorSession(
       P2PPortAllocator* allocator,
-      const std::string& channel_name,
-      int candidate);
+      int component,
+      const std::string& ice_username_fragment,
+      const std::string& ice_password);
   virtual ~P2PPortAllocatorSession();
 
   // WebKit::WebURLLoaderClient overrides.