Changes needed to roll libjingle r141

remoting/client/plugin/pepper_port_allocator.cc

 // 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.
 
 #include "remoting/client/plugin/pepper_port_allocator.h"
 
 #include "base/string_number_conversions.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/cpp/completion_callback.h"
 #include "ppapi/cpp/url_loader.h"
@@ skipping 10 matching lines @@
 // URLLoader. Normally the response from URL loader is smaller than 1kB.
 const int kReadSize = 1024;
 
 class PepperPortAllocatorSession
     : public cricket::HttpPortAllocatorSessionBase {
  public:
   PepperPortAllocatorSession(
       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,
       const pp::InstanceHandle& instance);
   virtual ~PepperPortAllocatorSession();
 
   // cricket::HttpPortAllocatorBase overrides.
   virtual void ConfigReady(cricket::PortConfiguration* config) OVERRIDE;
   virtual void SendSessionRequest(const std::string& host, int port) OVERRIDE;
 
@@ skipping 11 matching lines @@
   scoped_ptr<pp::URLLoader> url_loader_;
   std::vector<char> body_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperPortAllocatorSession);
 };
 
 PepperPortAllocatorSession::PepperPortAllocatorSession(
     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) {
 }
 
 PepperPortAllocatorSession::~PepperPortAllocatorSession() {
 }
 
 void PepperPortAllocatorSession::ConfigReady(
     cricket::PortConfiguration* config) {
   // Filter out non-UDP relay ports, so that we don't try using TCP.
   for (cricket::PortConfiguration::RelayList::iterator relay =
@@ skipping 127 matching lines @@
     scoped_ptr<talk_base::PacketSocketFactory> socket_factory)
     : HttpPortAllocatorBase(network_manager.get(), socket_factory.get(), ""),
       instance_(instance),
       network_manager_(network_manager.Pass()),
       socket_factory_(socket_factory.Pass()) {
 }
 
 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_);
 }
 
 }  // namespace remoting