Roll WebRTC 10010:10022, Libjingle 10011:10022

WebRTC 10010:10022

Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/ea85c10..a6e4fcd

Libjingle 10011:10022

Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/300c749..228d997

Review URL: https://codereview.chromium.org/1323243006

Cr-Commit-Position: refs/heads/master@{#350347}

5 files changed, 15 insertions, 23 deletions

diff --git a/DEPS b/DEPS
index f1d1741..85a11cb 100644
--- a/DEPS
+++ b/DEPS
@@ -191,7 +191,7 @@ deps = {
    Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '382b031ebab06b25df0708dd44aafad235657d2c',
 
   'src/third_party/libjingle/source/talk':
-    Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '300c7492bf1d44614047e24a453a1f13a9c9719d', # commit position 10011
+    Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '228d997b9a60b755dbc985b78b3053dc461b4be7', # commit position 10022
 
   'src/third_party/usrsctp/usrsctplib':
     Var('chromium_git') + '/external/usrsctplib.git' + '@' + '36444a999739e9e408f8f587cb4c3ffeef2e50ac', # from svn revision 9215
@@ -215,7 +215,7 @@ deps = {
    Var('chromium_git') + '/native_client/src/third_party/scons-2.0.1.git' + '@' + '1c1550e17fc26355d08627fbdec13d8291227067',
 
   'src/third_party/webrtc':
-    Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + 'ea85c10a428fd5f038e969e00833dd4b1a96e1f7', # commit position 10010
+    Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + 'a6e4fcd3f63f91d0f15cebb1e391c9d83d42d4d6', # commit position 10022
 
   'src/third_party/openmax_dl':
     Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' +  Var('openmax_dl_revision'),
diff --git a/remoting/protocol/libjingle_transport_factory.cc b/remoting/protocol/libjingle_transport_factory.cc
index 5099840..ec3a0f3 100644
--- a/remoting/protocol/libjingle_transport_factory.cc
+++ b/remoting/protocol/libjingle_transport_factory.cc
@@ -79,9 +79,8 @@ class LibjingleTransport
   void NotifyConnected();
 
   // Signal handlers for cricket::TransportChannel.
-  void OnRequestSignaling(cricket::TransportChannelImpl* channel);
-  void OnCandidateReady(cricket::TransportChannelImpl* channel,
-                        const cricket::Candidate& candidate);
+  void OnCandidateGathered(cricket::TransportChannelImpl* channel,
+                           const cricket::Candidate& candidate);
   void OnRouteChange(cricket::TransportChannel* channel,
                      const cricket::Candidate& candidate);
   void OnWritableState(cricket::TransportChannel* channel);
@@ -161,7 +160,7 @@ void LibjingleTransport::OnCanStart() {
   }
 
   while (!pending_candidates_.empty()) {
-    channel_->OnCandidate(pending_candidates_.front());
+    channel_->AddRemoteCandidate(pending_candidates_.front());
     pending_candidates_.pop_front();
   }
 }
@@ -199,10 +198,8 @@ void LibjingleTransport::DoStart() {
   event_handler_->OnTransportIceCredentials(this, ice_username_fragment_,
                                             ice_password);
   channel_->SetIceCredentials(ice_username_fragment_, ice_password);
-  channel_->SignalRequestSignaling.connect(
-      this, &LibjingleTransport::OnRequestSignaling);
-  channel_->SignalCandidateReady.connect(
-      this, &LibjingleTransport::OnCandidateReady);
+  channel_->SignalCandidateGathered.connect(
+      this, &LibjingleTransport::OnCandidateGathered);
   channel_->SignalRouteChange.connect(
       this, &LibjingleTransport::OnRouteChange);
   channel_->SignalWritableState.connect(
@@ -211,6 +208,7 @@ void LibjingleTransport::DoStart() {
       !(network_settings_.flags & NetworkSettings::NAT_TRAVERSAL_OUTGOING));
 
   channel_->Connect();
+  channel_->MaybeStartGathering();
 
   --connect_attempts_left_;
 
@@ -256,7 +254,7 @@ void LibjingleTransport::AddRemoteCandidate(
     return;
 
   if (channel_) {
-    channel_->OnCandidate(candidate);
+    channel_->AddRemoteCandidate(candidate);
   } else {
     pending_candidates_.push_back(candidate);
   }
@@ -272,13 +270,7 @@ bool LibjingleTransport::is_connected() const {
   return callback_.is_null();
 }
 
-void LibjingleTransport::OnRequestSignaling(
-    cricket::TransportChannelImpl* channel) {
-  DCHECK(CalledOnValidThread());
-  channel_->OnSignalingReady();
-}
-
-void LibjingleTransport::OnCandidateReady(
+void LibjingleTransport::OnCandidateGathered(
     cricket::TransportChannelImpl* channel,
     const cricket::Candidate& candidate) {
   DCHECK(CalledOnValidThread());
diff --git a/third_party/libjingle/BUILD.gn b/third_party/libjingle/BUILD.gn
index 7081f74..ad7e810 100644
--- a/third_party/libjingle/BUILD.gn
+++ b/third_party/libjingle/BUILD.gn
@@ -190,8 +190,8 @@ static_library("libjingle") {
     "$p2p_dir/base/transportchannel.cc",
     "$p2p_dir/base/transportchannel.h",
     "$p2p_dir/base/transportchannelimpl.h",
-    "$p2p_dir/base/transportchannelproxy.cc",
-    "$p2p_dir/base/transportchannelproxy.h",
+    "$p2p_dir/base/transportcontroller.cc",
+    "$p2p_dir/base/transportcontroller.h",
     "$p2p_dir/base/transportdescription.cc",
     "$p2p_dir/base/transportdescription.h",
     "$p2p_dir/base/transportdescriptionfactory.cc",
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium
index 44b914d..1969c19 100644
--- a/third_party/libjingle/README.chromium
+++ b/third_party/libjingle/README.chromium
@@ -1,7 +1,7 @@
 Name: libjingle
 URL: http://code.google.com/p/webrtc/
 Version: unknown
-Revision: 10011
+Revision: 10022
 License: BSD
 License File: source/talk/COPYING
 Security Critical: yes
diff --git a/third_party/libjingle/libjingle_common.gypi b/third_party/libjingle/libjingle_common.gypi
index 26b0ad5..951921f 100644
--- a/third_party/libjingle/libjingle_common.gypi
+++ b/third_party/libjingle/libjingle_common.gypi
@@ -54,8 +54,8 @@
     '<(webrtc_p2p)/base/transportchannel.cc',
     '<(webrtc_p2p)/base/transportchannel.h',
     '<(webrtc_p2p)/base/transportchannelimpl.h',
-    '<(webrtc_p2p)/base/transportchannelproxy.cc',
-    '<(webrtc_p2p)/base/transportchannelproxy.h',
+    '<(webrtc_p2p)/base/transportcontroller.cc',
+    '<(webrtc_p2p)/base/transportcontroller.h',
     '<(webrtc_p2p)/base/transportdescription.cc',
     '<(webrtc_p2p)/base/transportdescription.h',
     '<(webrtc_p2p)/base/transportdescriptionfactory.cc',