Changes needed to roll libjingle r141

remoting/host/host_port_allocator.cc

Index: remoting/host/host_port_allocator.cc
===================================================================
--- remoting/host/host_port_allocator.cc	(revision 136430)
+++ remoting/host/host_port_allocator.cc	(working copy)
@@ -24,6 +24,8 @@
       cricket::HttpPortAllocatorBase* allocator,
       const std::string& channel_name,
       int component,
+      const std::string& ice_username_fragment,
+      const std::string& ice_password,
       const std::vector<talk_base::SocketAddress>& stun_hosts,
       const std::vector<std::string>& relay_hosts,
       const std::string& relay,
@@ -50,12 +52,15 @@
     cricket::HttpPortAllocatorBase* allocator,
     const std::string& channel_name,
     int component,
+    const std::string& ice_username_fragment,
+    const std::string& ice_password,
     const std::vector<talk_base::SocketAddress>& stun_hosts,
     const std::vector<std::string>& relay_hosts,
     const std::string& relay,
     const scoped_refptr<net::URLRequestContextGetter>& url_context)
     : HttpPortAllocatorSessionBase(
-        allocator, channel_name, component, stun_hosts, relay_hosts, relay, ""),
+        allocator, channel_name, component, ice_username_fragment, ice_password,
+        stun_hosts, relay_hosts, relay, ""),
       url_context_(url_context) {
 }
 
@@ -154,12 +159,14 @@
 HostPortAllocator::~HostPortAllocator() {
 }
 
-cricket::PortAllocatorSession* HostPortAllocator::CreateSession(
+cricket::PortAllocatorSession* HostPortAllocator::CreateSessionInternal(
     const std::string& channel_name,
-    int component) {
+    int component,
+    const std::string& ice_username_fragment,
+    const std::string& ice_password) {
   return new HostPortAllocatorSession(
-      this, channel_name, component, stun_hosts(),
-      relay_hosts(), relay_token(), url_context_);
+      this, channel_name, component, ice_username_fragment, ice_password,
+      stun_hosts(), relay_hosts(), relay_token(), url_context_);
 }
 
 }  // namespace remoting