Roll libjingle to 125.

* Fix for issue 118455.

BUG=118455
TEST=apprtc on linux and win and try bots
Review URL: https://chromiumcodereview.appspot.com/9702101

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

3 files changed, 8 insertions, 43 deletions

diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium
index 6a8005a..fa54207 100644
--- a/third_party/libjingle/README.chromium
+++ b/third_party/libjingle/README.chromium
@@ -2,7 +2,7 @@ Name: Libjingle library. Used for p2p voice and video communication.
 Short Name: libjingle
 URL: http://code.google.com/p/libjingle/
 Version: 0.6.16
-Revision: 124
+Revision: 125
 License: BSD
 License File: source/COPYING
 Security Critical: yes
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 1bb70ae..4491d27 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -257,6 +257,8 @@
         'source/talk/base/proxydetect.h',
         'source/talk/base/proxyinfo.cc',
         'source/talk/base/proxyinfo.h',
+        'source/talk/base/ratelimiter.cc',
+        'source/talk/base/ratelimiter.h',
         'source/talk/base/ratetracker.cc',
         'source/talk/base/ratetracker.h',
         'source/talk/base/sec_buffer.h',
@@ -496,14 +498,11 @@
       'sources': [
         'source/talk/app/webrtc/audiotrack.cc',
         'source/talk/app/webrtc/audiotrack.h',
-        'source/talk/app/webrtc/candidateobserver.h',
         'source/talk/app/webrtc/jsep.h',
         'source/talk/app/webrtc/jsepicecandidate.cc',
         'source/talk/app/webrtc/jsepicecandidate.h',
         'source/talk/app/webrtc/jsepsessiondescription.cc',
         'source/talk/app/webrtc/jsepsessiondescription.h',
-        'source/talk/app/webrtc/jsepsignaling.cc',
-        'source/talk/app/webrtc/jsepsignaling.h',
         'source/talk/app/webrtc/mediastream.cc',
         'source/talk/app/webrtc/mediastream.h',
         'source/talk/app/webrtc/mediastreamhandler.cc',
@@ -512,6 +511,8 @@
         'source/talk/app/webrtc/mediastreamprovider.h',
         'source/talk/app/webrtc/mediastreamproxy.cc',
         'source/talk/app/webrtc/mediastreamproxy.h',
+        'source/talk/app/webrtc/mediastreamsignaling.cc',
+        'source/talk/app/webrtc/mediastreamsignaling.h',
         'source/talk/app/webrtc/mediastreamtrackproxy.cc',
         'source/talk/app/webrtc/mediastreamtrackproxy.h',
         'source/talk/app/webrtc/mediatrackimpl.h',
@@ -521,8 +522,6 @@
         'source/talk/app/webrtc/peerconnectionfactoryimpl.h',
         'source/talk/app/webrtc/peerconnectionimpl.cc',
         'source/talk/app/webrtc/peerconnectionimpl.h',
-        'source/talk/app/webrtc/peerconnectionsignaling.cc',
-        'source/talk/app/webrtc/peerconnectionsignaling.h',
         'source/talk/app/webrtc/portallocatorfactory.cc',
         'source/talk/app/webrtc/portallocatorfactory.h',
         'source/talk/app/webrtc/roaperrorcodes.h',
@@ -530,13 +529,12 @@
         'source/talk/app/webrtc/roapmessages.h',
         'source/talk/app/webrtc/roapsession.cc',
         'source/talk/app/webrtc/roapsession.h',
-        'source/talk/app/webrtc/sessiondescriptionprovider.h',
+        'source/talk/app/webrtc/roapsignaling.cc',
+        'source/talk/app/webrtc/roapsignaling.h',
         'source/talk/app/webrtc/streamcollectionimpl.h',
         'source/talk/app/webrtc/videorendererimpl.cc',
         'source/talk/app/webrtc/videotrack.cc',
         'source/talk/app/webrtc/videotrack.h',
-        'source/talk/app/webrtc/webrtcjson.cc',
-        'source/talk/app/webrtc/webrtcjson.h',
         'source/talk/app/webrtc/webrtcsdp.cc',
         'source/talk/app/webrtc/webrtcsdp.h',
         'source/talk/app/webrtc/webrtcsession.cc',
diff --git a/third_party/libjingle/overrides/talk/base/messagequeue.cc b/third_party/libjingle/overrides/talk/base/messagequeue.cc
index 4d66b12..36ddc7a 100644
--- a/third_party/libjingle/overrides/talk/base/messagequeue.cc
+++ b/third_party/libjingle/overrides/talk/base/messagequeue.cc
@@ -37,42 +37,9 @@
 #include "talk/base/event.h"
 #include "talk/base/logging.h"
 #include "talk/base/messagequeue.h"
+#include "talk/base/nullsocketserver.h"
 #include "talk/base/physicalsocketserver.h"
 
-namespace {
-//------------------------------------------------------------------
-// NullSocketServer
-
-class NullSocketServer : public talk_base::SocketServer {
- public:
-  NullSocketServer() : event_(false, false) {}
-
-  virtual bool Wait(int cms, bool process_io) {
-    return event_.Wait(talk_base::kForever);
-  }
-
-  virtual void WakeUp() {
-    event_.Set();
-  }
-
-  virtual talk_base::Socket* CreateSocket(int type) {
-    ASSERT(false);
-    return NULL;
-  }
-
-  // Returns a new socket for nonblocking communication.  The type can be
-  // SOCK_DGRAM and/or SOCK_STREAM.
-  virtual talk_base::AsyncSocket* CreateAsyncSocket(int type) {
-    ASSERT(false);
-    return NULL;
-  }
-
- private:
-  talk_base::Event event_;
-};
-
-}  // namespace
-
 namespace talk_base {
 
 const uint32 kMaxMsgLatency = 150;  // 150 ms