Roll libjingle to r126.

content/renderer/p2p/p2p_transport_impl.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 "content/renderer/p2p/p2p_transport_impl.h"
 
 #include "content/renderer/p2p/ipc_network_manager.h"
 #include "content/renderer/p2p/ipc_socket_factory.h"
 #include "content/renderer/p2p/port_allocator.h"
 #include "jingle/glue/channel_socket_adapter.h"
@@ skipping 107 matching lines @@
   cricket::Candidate candidate;
   if (!jingle_glue::DeserializeP2PCandidate(address, &candidate)) {
     LOG(ERROR) << "Failed to parse candidate " << address;
     return false;
   }
 
   channel_->OnCandidate(candidate);
   return true;
 }
 
-void P2PTransportImpl::OnRequestSignaling() {
+void P2PTransportImpl::OnRequestSignaling(
+    cricket::TransportChannelImpl* /*channel*/) {

[Sergey Ulanov, 2012/03/19 23:44:08]

no need to comment parameter name.

[Ronghua Wu (Left Chromium), 2012/03/20 15:19:31]

Done.

   channel_->OnSignalingReady();
 }
 
 void P2PTransportImpl::OnCandidateReady(
     cricket::TransportChannelImpl* channel,
     const cricket::Candidate& candidate) {
   event_handler_->OnCandidateReady(
       jingle_glue::SerializeP2PCandidate(candidate));
 }
 
@@ skipping 20 matching lines @@
 void P2PTransportImpl::OnTcpConnected(int result) {
   if (result < 0) {
     event_handler_->OnError(result);
     return;
   }
   state_ = static_cast<State>(STATE_READABLE | STATE_WRITABLE);
   event_handler_->OnStateChange(state_);
 }
 
 }  // namespace content