Changes needed to roll libjingle r141

content/renderer/p2p/port_allocator.h

Index: content/renderer/p2p/port_allocator.h
===================================================================
--- content/renderer/p2p/port_allocator.h	(revision 135898)
+++ content/renderer/p2p/port_allocator.h	(working copy)
@@ -34,9 +34,11 @@
                    const webkit_glue::P2PTransport::Config& config);
   virtual ~P2PPortAllocator();
 
-  virtual cricket::PortAllocatorSession* CreateSession(
+  virtual cricket::PortAllocatorSession* CreateSessionInternal(
       const std::string& channel_name,
-      int component) OVERRIDE;
+      int component,
+      const std::string& ice_ufrag,

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

ise_username_fragment or just ice_username?

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

Done.

+      const std::string& ice_pwd) OVERRIDE;

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

ice_password?

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

Done.

 
  private:
   friend class P2PPortAllocatorSession;
@@ -54,7 +56,9 @@
   P2PPortAllocatorSession(
       P2PPortAllocator* allocator,
       const std::string& channel_name,
-      int candidate);
+      int component,
+      const std::string& ice_ufrag,

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

same here

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

Done.

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

Done.

+      const std::string& ice_pwd);
   virtual ~P2PPortAllocatorSession();
 
   // WebKit::WebURLLoaderClient overrides.