Changes needed to roll libjingle r141

remoting/client/plugin/pepper_port_allocator.cc

Index: remoting/client/plugin/pepper_port_allocator.cc
===================================================================
--- remoting/client/plugin/pepper_port_allocator.cc	(revision 135898)
+++ remoting/client/plugin/pepper_port_allocator.cc	(working copy)
@@ -28,6 +28,8 @@
       cricket::HttpPortAllocatorBase* allocator,
       const std::string& channel_name,
       int component,
+      const std::string& ice_ufrag,

[Sergey Ulanov, 2012/05/09 18:58:00]

here and below in this file.

[Mallinath (Gone from Chromium), 2012/05/09 22:04:22]

Done.

+      const std::string& ice_pwd,
       const std::vector<talk_base::SocketAddress>& stun_hosts,
       const std::vector<std::string>& relay_hosts,
       const std::string& relay,
@@ -59,12 +61,15 @@
     cricket::HttpPortAllocatorBase* allocator,
     const std::string& channel_name,
     int component,
+    const std::string& ice_ufrag,
+    const std::string& ice_pwd,
     const std::vector<talk_base::SocketAddress>& stun_hosts,
     const std::vector<std::string>& relay_hosts,
     const std::string& relay,
     const pp::InstanceHandle& instance)
     : HttpPortAllocatorSessionBase(
-        allocator, channel_name, component, stun_hosts, relay_hosts, relay, ""),
+        allocator, channel_name, component, ice_ufrag, ice_pwd,
+        stun_hosts, relay_hosts, relay, ""),
       instance_(instance) {
 }
 
@@ -212,11 +217,13 @@
 PepperPortAllocator::~PepperPortAllocator() {
 }
 
-cricket::PortAllocatorSession* PepperPortAllocator::CreateSession(
+cricket::PortAllocatorSession* PepperPortAllocator::CreateSessionInternal(
     const std::string& channel_name,
-    int component) {
+    int component,
+    const std::string& ice_ufrag,
+    const std::string& ice_pwd) {
    return new PepperPortAllocatorSession(
-       this, channel_name, component, stun_hosts(),
+       this, channel_name, component, ice_ufrag, ice_pwd, stun_hosts(),
        relay_hosts(), relay_token(), instance_);
 }