Roll libjingle to r126.

content/renderer/p2p/p2p_transport_impl.h

-// Copyright (c) 2011 The Chromium Authors. All rights reserved.
+// 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 CONTENT_RENDERER_P2P_P2P_TRANSPORT_IMPL_H_
 #define CONTENT_RENDERER_P2P_P2P_TRANSPORT_IMPL_H_
 
 #include <string>
 
 #include "base/basictypes.h"
 #include "base/compiler_specific.h"
@@ skipping 47 matching lines @@
                     const std::string& name,
                     Protocol protocol,
                     const Config& config,
                     EventHandler* event_handler) OVERRIDE;
   virtual bool AddRemoteCandidate(const std::string& address) OVERRIDE;
   virtual net::Socket* GetChannel() OVERRIDE;
 
  private:
   class ChannelAdapter;
 
-  void OnRequestSignaling();
+  void OnRequestSignaling(cricket::TransportChannelImpl* channel);
   void OnCandidateReady(cricket::TransportChannelImpl* channel,
                         const cricket::Candidate& candidate);
   void OnReadableState(cricket::TransportChannel* channel);
   void OnWriteableState(cricket::TransportChannel* channel);
 
   void OnTcpConnected(int result);
 
   P2PSocketDispatcher* socket_dispatcher_;
   std::string name_;
   EventHandler* event_handler_;
   State state_;
 
   scoped_ptr<talk_base::NetworkManager> network_manager_;
   scoped_ptr<talk_base::PacketSocketFactory> socket_factory_;
 
   scoped_ptr<cricket::PortAllocator> allocator_;
   scoped_ptr<cricket::P2PTransportChannel> channel_;
 
   scoped_ptr<jingle_glue::TransportChannelSocketAdapter> channel_adapter_;
   scoped_ptr<jingle_glue::PseudoTcpAdapter> pseudo_tcp_adapter_;
 
   DISALLOW_COPY_AND_ASSIGN(P2PTransportImpl);
 };
 
 }  // namespace content
 
 #endif  // CONTENT_RENDERER_P2P_P2P_TRANSPORT_IMPL_H_