Changes needed to roll libjingle r141

remoting/client/plugin/pepper_port_allocator.h

 // 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.
 
 #ifndef REMOTING_CLIENT_PLUGIN_PEPPER_PORT_ALLOCATOR_H_
 #define REMOTING_CLIENT_PLUGIN_PEPPER_PORT_ALLOCATOR_H_
 
 #include "base/compiler_specific.h"
 #include "base/memory/scoped_ptr.h"
 #include "ppapi/cpp/instance_handle.h"
 #include "third_party/libjingle/source/talk/p2p/client/httpportallocator.h"
 
 namespace remoting {
 
 // An implementation of cricket::PortAllocator for libjingle that is
 // used by the client plugin. The main difference from
 // cricket::HttpPortAllocator is that it uses Pepper URLLoader API
 // when creating relay sessions.
 class PepperPortAllocator : public cricket::HttpPortAllocatorBase {
  public:
   static scoped_ptr<PepperPortAllocator> Create(
       const pp::InstanceHandle& instance);
   virtual ~PepperPortAllocator();
 
   // cricket::HttpPortAllocatorBase overrides.
-  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]

names

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

Done.

+      const std::string& ice_pwd) OVERRIDE;
 
  private:
   PepperPortAllocator(
       const pp::InstanceHandle& instance,
       scoped_ptr<talk_base::NetworkManager> network_manager,
       scoped_ptr<talk_base::PacketSocketFactory> socket_factory);
 
   pp::InstanceHandle instance_;
   scoped_ptr<talk_base::NetworkManager> network_manager_;
   scoped_ptr<talk_base::PacketSocketFactory> socket_factory_;
 
   DISALLOW_COPY_AND_ASSIGN(PepperPortAllocator);
 };
 
 }  // namespace remoting
 
 #endif  // REMOTING_CLIENT_PLUGIN_PEPPER_PORT_ALLOCATOR_H_