Roll libjingle to r126.

remoting/protocol/libjingle_transport_factory.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/protocol/libjingle_transport_factory.h"
 
 #include "base/message_loop_proxy.h"
 #include "jingle/glue/channel_socket_adapter.h"
 #include "jingle/glue/pseudotcp_adapter.h"
 #include "jingle/glue/utils.h"
@@ skipping 32 matching lines @@
       const TransportConfig& config,
       Transport::EventHandler* event_handler,
       scoped_ptr<ChannelAuthenticator> authenticator) OVERRIDE;
   virtual void Connect(
       const StreamTransport::ConnectedCallback& callback) OVERRIDE;
   virtual void AddRemoteCandidate(const cricket::Candidate& candidate) OVERRIDE;
   virtual const std::string& name() const OVERRIDE;
   virtual bool is_connected() const OVERRIDE;
 
  private:
-  void OnRequestSignaling();
+  void OnRequestSignaling(cricket::TransportChannelImpl* channel);
   void OnCandidateReady(cricket::TransportChannelImpl* channel,
                         const cricket::Candidate& candidate);
   void OnRouteChange(cricket::TransportChannel* channel,
                      const cricket::Candidate& candidate);
 
   void OnTcpConnected(int result);
   void OnAuthenticationDone(net::Error error,
                             scoped_ptr<net::StreamSocket> socket);
 
   void OnChannelDestroyed();
@@ skipping 136 matching lines @@
 const std::string& LibjingleStreamTransport::name() const {
   DCHECK(CalledOnValidThread());
   return name_;
 }
 
 bool LibjingleStreamTransport::is_connected() const {
   DCHECK(CalledOnValidThread());
   return callback_.is_null();
 }
 
-void LibjingleStreamTransport::OnRequestSignaling() {
+void LibjingleStreamTransport::OnRequestSignaling(
+    cricket::TransportChannelImpl* /*channel*/) {

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

uncomment channel

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

Done.

   DCHECK(CalledOnValidThread());
   channel_->OnSignalingReady();
 }
 
 void LibjingleStreamTransport::OnCandidateReady(
     cricket::TransportChannelImpl* channel,
     const cricket::Candidate& candidate) {
   DCHECK(CalledOnValidThread());
   event_handler_->OnTransportCandidate(this, candidate);
 }
@@ skipping 116 matching lines @@
 
 scoped_ptr<DatagramTransport>
 LibjingleTransportFactory::CreateDatagramTransport() {
   NOTIMPLEMENTED();
   return scoped_ptr<DatagramTransport>(NULL);
 }
 
 
 }  // namespace protocol
 }  // namespace remoting