Roll libjingle 88:92

third_party/libjingle/libjingle.gyp

 # Copyright (c) 2011 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.
 
 {
   'variables': {
     'no_libjingle_logging%': 0,
   },
   'includes': [
     '../../build/win_precompile.gypi',
@@ skipping 138 matching lines @@
         'overrides/talk/base/constructormagic.h',
 
         # Need to override logging.h because we need
         # SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS to work.
         # TODO(sergeyu): push SAFE_TO_DEFINE_TALK_BASE_LOGGING_MACROS to
         # libjingle and remove this override.
         'overrides/talk/base/logging.h',
 
         'overrides/talk/base/scoped_ptr.h',
 
-        # Libjingle's QName is not threadsafe, so we need to use our own version
-        # here.
-        # TODO(sergeyu): Fix QName in Libjingle.
-        'overrides/talk/xmllite/qname.cc',
-        'overrides/talk/xmllite/qname.h',
-
         'source/talk/base/Equifax_Secure_Global_eBusiness_CA-1.h',
         'source/talk/base/asyncfile.cc',
         'source/talk/base/asyncfile.h',
         'source/talk/base/asynchttprequest.cc',
         'source/talk/base/asynchttprequest.h',
         'source/talk/base/asyncpacketsocket.h',
         'source/talk/base/asyncsocket.cc',
         'source/talk/base/asyncsocket.h',
         'source/talk/base/asynctcpsocket.cc',
         'source/talk/base/asynctcpsocket.h',
@@ skipping 99 matching lines @@
         'source/talk/base/taskrunner.cc',
         'source/talk/base/taskrunner.h',
         'source/talk/base/thread.cc',
         'source/talk/base/thread.h',
         'source/talk/base/time.cc',
         'source/talk/base/time.h',
         'source/talk/base/urlencode.cc',
         'source/talk/base/urlencode.h',
         'source/talk/base/worker.cc',
         'source/talk/base/worker.h',
+        'source/talk/xmllite/qname.cc',
+        'source/talk/xmllite/qname.h',
         'source/talk/xmllite/xmlbuilder.cc',
         'source/talk/xmllite/xmlbuilder.h',
         'source/talk/xmllite/xmlconstants.cc',
         'source/talk/xmllite/xmlconstants.h',
         'source/talk/xmllite/xmlelement.cc',
         'source/talk/xmllite/xmlelement.h',
         'source/talk/xmllite/xmlnsstack.cc',
         'source/talk/xmllite/xmlnsstack.h',
         'source/talk/xmllite/xmlparser.cc',
         'source/talk/xmllite/xmlparser.h',
@@ skipping 147 matching lines @@
         'source/talk/session/tunnel/tunnelsessionclient.cc',
         'source/talk/session/tunnel/tunnelsessionclient.h',
       ],
       'dependencies': [
         'libjingle',
       ],
     },  # target libjingle_p2p
     {
       'target_name': 'libjingle_peerconnection',
       'type': 'static_library',
-      'sources': [        
+      'sources': [
         'source/talk/app/webrtc/peerconnection.h',
         'source/talk/app/webrtc/peerconnectionfactory.cc',
         'source/talk/app/webrtc/peerconnectionfactory.h',
         'source/talk/app/webrtc/peerconnectionimpl.cc',
         'source/talk/app/webrtc/peerconnectionimpl.h',
         'source/talk/app/webrtc/peerconnectionproxy.cc',
         'source/talk/app/webrtc/peerconnectionproxy.h',
         'source/talk/app/webrtc/webrtcsession.cc',
         'source/talk/app/webrtc/webrtcsession.h',
         'source/talk/app/webrtc/webrtcjson.cc',
         'source/talk/app/webrtc/webrtcjson.h',
         'source/talk/session/phone/audiomonitor.cc',
         'source/talk/session/phone/audiomonitor.h',
         'source/talk/session/phone/call.cc',
         'source/talk/session/phone/call.h',
         'source/talk/session/phone/channel.cc',
         'source/talk/session/phone/channel.h',
         'source/talk/session/phone/channelmanager.cc',
         'source/talk/session/phone/channelmanager.h',
         'source/talk/session/phone/codec.cc',
         'source/talk/session/phone/codec.h',
         'source/talk/session/phone/cryptoparams.h',
         'source/talk/session/phone/currentspeakermonitor.cc',
         'source/talk/session/phone/currentspeakermonitor.h',
-        'source/talk/session/phone/devicemanager.cc',
-        'source/talk/session/phone/devicemanager.h',
+        # See http://crbug.com/102012
+        # 'source/talk/session/phone/devicemanager.cc',
+        # 'source/talk/session/phone/devicemanager.h',
         'source/talk/session/phone/filemediaengine.cc',
-        'source/talk/session/phone/filemediaengine.h',   
+        'source/talk/session/phone/filemediaengine.h',
         'source/talk/session/phone/mediachannel.h',
-        'source/talk/session/phone/mediaengine.cc',
-        'source/talk/session/phone/mediaengine.h',
+        # See http://crbug.com/102451
+        # 'source/talk/session/phone/mediaengine.cc',
+        # 'source/talk/session/phone/mediaengine.h',
         'source/talk/session/phone/mediamessages.cc',
         'source/talk/session/phone/mediamessages.h',
         'source/talk/session/phone/mediamonitor.cc',
         'source/talk/session/phone/mediamonitor.h',
         'source/talk/session/phone/mediasession.cc',
         'source/talk/session/phone/mediasession.h',
         'source/talk/session/phone/mediasessionclient.cc',
         'source/talk/session/phone/mediasessionclient.h',
         'source/talk/session/phone/mediasink.h',
         'source/talk/session/phone/rtcpmuxfilter.cc',
-        'source/talk/session/phone/rtcpmuxfilter.h',        
+        'source/talk/session/phone/rtcpmuxfilter.h',
         'source/talk/session/phone/rtpdump.cc',
         'source/talk/session/phone/rtpdump.h',
         'source/talk/session/phone/rtputils.cc',
         'source/talk/session/phone/rtputils.h',
         'source/talk/session/phone/soundclip.cc',
         'source/talk/session/phone/soundclip.h',
-        'source/talk/session/phone/srtpfilter.cc',
-        'source/talk/session/phone/srtpfilter.h',
+        # See http://crbug.com/102451
+        # 'source/talk/session/phone/srtpfilter.cc',
+        # 'source/talk/session/phone/srtpfilter.h',
         'source/talk/session/phone/videocommon.h',
+        'source/talk/session/phone/videoframe.cc',
+        'source/talk/session/phone/videoframe.h',
         'source/talk/session/phone/voicechannel.h',
         'source/talk/session/phone/webrtccommon.h',
         'source/talk/session/phone/webrtcpassthroughrender.cc',
-        'source/talk/session/phone/webrtcvideoengine.cc',
-        'source/talk/session/phone/webrtcvideoengine.h',
+        # See http://crbug.com/102451
+        # 'source/talk/session/phone/webrtcvideoengine.cc',
+        # 'source/talk/session/phone/webrtcvideoengine.h',
         'source/talk/session/phone/webrtcvideoframe.cc',
         'source/talk/session/phone/webrtcvideoframe.h',
         'source/talk/session/phone/webrtcvie.h',
         'source/talk/session/phone/webrtcvoe.h',
         'source/talk/session/phone/webrtcvoiceengine.cc',
         'source/talk/session/phone/webrtcvoiceengine.h',
       ],
       'dependencies': [
         '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_capture_module',
         '<(DEPTH)/third_party/webrtc/modules/modules.gyp:video_render_module',
         '<(DEPTH)/third_party/webrtc/video_engine/video_engine.gyp:video_engine_core',
         '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine_core',
         '<(DEPTH)/third_party/webrtc/system_wrappers/source/system_wrappers.gyp:system_wrappers',
         'libjingle',
         'libjingle_p2p',
-      ],          
+      ],
     },  # target libjingle_peerconnection
   ],
 }