Roll libjingle to r126.

- Implemented ROAP on top of JSEP.
- Added a new signal after PortAllocatorSesison discoves all candidates for
  the channel.

TEST=try bots and apprtc.appspot.com
Review URL: https://chromiumcodereview.appspot.com/9727011

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@127702 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 7 insertions, 5 deletions

diff --git a/content/renderer/media/mock_peer_connection_impl.cc b/content/renderer/media/mock_peer_connection_impl.cc
index b362af9..8eeba32 100644
--- a/content/renderer/media/mock_peer_connection_impl.cc
+++ b/content/renderer/media/mock_peer_connection_impl.cc
@@ -91,8 +91,9 @@ MockPeerConnectionImpl::SdpState MockPeerConnectionImpl::sdp_state() {
   return kSdpNew;
 }
 
-void MockPeerConnectionImpl::StartIce(IceOptions options) {
+bool MockPeerConnectionImpl::StartIce(IceOptions options) {
   NOTIMPLEMENTED();
+  return false;
 }
 
 webrtc::SessionDescriptionInterface* MockPeerConnectionImpl::CreateOffer(
diff --git a/content/renderer/media/mock_peer_connection_impl.h b/content/renderer/media/mock_peer_connection_impl.h
index 9192e2a..3c78c76 100644
--- a/content/renderer/media/mock_peer_connection_impl.h
+++ b/content/renderer/media/mock_peer_connection_impl.h
@@ -32,7 +32,7 @@ class MockPeerConnectionImpl : public PeerConnectionInterface {
   virtual void Close() OVERRIDE;
   virtual ReadyState ready_state() OVERRIDE;
   virtual SdpState sdp_state() OVERRIDE;
-  virtual void StartIce(IceOptions options) OVERRIDE;
+  virtual bool StartIce(IceOptions options) OVERRIDE;
 
   virtual webrtc::SessionDescriptionInterface* CreateOffer(
       const webrtc::MediaHints& hints) OVERRIDE;
diff --git a/content/renderer/p2p/p2p_transport_impl.cc b/content/renderer/p2p/p2p_transport_impl.cc
index 550947c..8554981 100644
--- a/content/renderer/p2p/p2p_transport_impl.cc
+++ b/content/renderer/p2p/p2p_transport_impl.cc
@@ -125,7 +125,8 @@ bool P2PTransportImpl::AddRemoteCandidate(const std::string& address) {
   return true;
 }
 
-void P2PTransportImpl::OnRequestSignaling() {
+void P2PTransportImpl::OnRequestSignaling(
+    cricket::TransportChannelImpl* channel) {
   channel_->OnSignalingReady();
 }
 
diff --git a/content/renderer/p2p/p2p_transport_impl.h b/content/renderer/p2p/p2p_transport_impl.h
index 70e8422..a6f9101 100644
--- a/content/renderer/p2p/p2p_transport_impl.h
+++ b/content/renderer/p2p/p2p_transport_impl.h
@@ -1,4 +1,4 @@
-// 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.
 
@@ -66,7 +66,7 @@ class CONTENT_EXPORT P2PTransportImpl
  private:
   class ChannelAdapter;
 
-  void OnRequestSignaling();
+  void OnRequestSignaling(cricket::TransportChannelImpl* channel);
   void OnCandidateReady(cricket::TransportChannelImpl* channel,
                         const cricket::Candidate& candidate);
   void OnReadableState(cricket::TransportChannel* channel);