Roll WebRTC 11523:11548, Libjingle 11522:11545

WebRTC 11523:11548
Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/4def420..608b2be

Libjingle 11522:11545
Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/01cbe5b..bb467ca

Updated libjingle GYP+GN for talk/app/webrtc move that happened in
https://codereview.webrtc.org/1610243002/

TBR=tommi@chromium.org, sergeyu@chromium.org
BUG=webrtc:5418

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

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

3 files changed, 145 insertions, 145 deletions

diff --git a/third_party/libjingle/BUILD.gn b/third_party/libjingle/BUILD.gn
index bc2c3e7..be97212 100644
--- a/third_party/libjingle/BUILD.gn
+++ b/third_party/libjingle/BUILD.gn
@@ -296,6 +296,78 @@ if (enable_webrtc) {
   # as is supported in the GYP build. It's not clear what this is used for.
   source_set("libjingle_webrtc_common") {
     sources = [
+      "../webrtc/api/audiotrack.cc",
+      "../webrtc/api/audiotrack.h",
+      "../webrtc/api/datachannel.cc",
+      "../webrtc/api/datachannel.h",
+      "../webrtc/api/dtlsidentitystore.cc",
+      "../webrtc/api/dtlsidentitystore.h",
+      "../webrtc/api/dtmfsender.cc",
+      "../webrtc/api/dtmfsender.h",
+      "../webrtc/api/jsep.h",
+      "../webrtc/api/jsepicecandidate.cc",
+      "../webrtc/api/jsepicecandidate.h",
+      "../webrtc/api/jsepsessiondescription.cc",
+      "../webrtc/api/jsepsessiondescription.h",
+      "../webrtc/api/localaudiosource.cc",
+      "../webrtc/api/localaudiosource.h",
+      "../webrtc/api/mediaconstraintsinterface.cc",
+      "../webrtc/api/mediaconstraintsinterface.h",
+      "../webrtc/api/mediacontroller.cc",
+      "../webrtc/api/mediacontroller.h",
+      "../webrtc/api/mediastream.cc",
+      "../webrtc/api/mediastream.h",
+      "../webrtc/api/mediastreamhandler.cc",
+      "../webrtc/api/mediastreamhandler.h",
+      "../webrtc/api/mediastreaminterface.h",
+      "../webrtc/api/mediastreamobserver.cc",
+      "../webrtc/api/mediastreamobserver.h",
+      "../webrtc/api/mediastreamprovider.h",
+      "../webrtc/api/mediastreamproxy.h",
+      "../webrtc/api/mediastreamtrack.h",
+      "../webrtc/api/mediastreamtrackproxy.h",
+      "../webrtc/api/notifier.h",
+      "../webrtc/api/peerconnection.cc",
+      "../webrtc/api/peerconnection.h",
+      "../webrtc/api/peerconnectionfactory.cc",
+      "../webrtc/api/peerconnectionfactory.h",
+      "../webrtc/api/peerconnectioninterface.h",
+      "../webrtc/api/portallocatorfactory.cc",
+      "../webrtc/api/portallocatorfactory.h",
+      "../webrtc/api/remoteaudiosource.cc",
+      "../webrtc/api/remoteaudiosource.h",
+      "../webrtc/api/remoteaudiotrack.cc",
+      "../webrtc/api/remoteaudiotrack.h",
+      "../webrtc/api/remotevideocapturer.cc",
+      "../webrtc/api/remotevideocapturer.h",
+      "../webrtc/api/rtpreceiver.cc",
+      "../webrtc/api/rtpreceiver.h",
+      "../webrtc/api/rtpreceiverinterface.h",
+      "../webrtc/api/rtpsender.cc",
+      "../webrtc/api/rtpsender.h",
+      "../webrtc/api/rtpsenderinterface.h",
+      "../webrtc/api/sctputils.cc",
+      "../webrtc/api/sctputils.h",
+      "../webrtc/api/statscollector.cc",
+      "../webrtc/api/statscollector.h",
+      "../webrtc/api/statstypes.cc",
+      "../webrtc/api/statstypes.h",
+      "../webrtc/api/streamcollection.h",
+      "../webrtc/api/umametrics.h",
+      "../webrtc/api/videosource.cc",
+      "../webrtc/api/videosource.h",
+      "../webrtc/api/videosourceinterface.h",
+      "../webrtc/api/videosourceproxy.h",
+      "../webrtc/api/videotrack.cc",
+      "../webrtc/api/videotrack.h",
+      "../webrtc/api/videotrackrenderers.cc",
+      "../webrtc/api/videotrackrenderers.h",
+      "../webrtc/api/webrtcsdp.cc",
+      "../webrtc/api/webrtcsdp.h",
+      "../webrtc/api/webrtcsession.cc",
+      "../webrtc/api/webrtcsession.h",
+      "../webrtc/api/webrtcsessiondescriptionfactory.cc",
+      "../webrtc/api/webrtcsessiondescriptionfactory.h",
       "../webrtc/media/base/audiorenderer.h",
       "../webrtc/media/base/capturemanager.cc",
       "../webrtc/media/base/capturemanager.h",
@@ -338,78 +410,6 @@ if (enable_webrtc) {
       "../webrtc/media/webrtc/webrtcvideoframefactory.cc",
       "../webrtc/media/webrtc/webrtcvideoframefactory.h",
       "../webrtc/media/webrtc/webrtcvoe.h",
-      "source/talk/app/webrtc/audiotrack.cc",
-      "source/talk/app/webrtc/audiotrack.h",
-      "source/talk/app/webrtc/datachannel.cc",
-      "source/talk/app/webrtc/datachannel.h",
-      "source/talk/app/webrtc/dtlsidentitystore.cc",
-      "source/talk/app/webrtc/dtlsidentitystore.h",
-      "source/talk/app/webrtc/dtmfsender.cc",
-      "source/talk/app/webrtc/dtmfsender.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/localaudiosource.cc",
-      "source/talk/app/webrtc/localaudiosource.h",
-      "source/talk/app/webrtc/mediaconstraintsinterface.cc",
-      "source/talk/app/webrtc/mediaconstraintsinterface.h",
-      "source/talk/app/webrtc/mediacontroller.cc",
-      "source/talk/app/webrtc/mediacontroller.h",
-      "source/talk/app/webrtc/mediastream.cc",
-      "source/talk/app/webrtc/mediastream.h",
-      "source/talk/app/webrtc/mediastreamhandler.cc",
-      "source/talk/app/webrtc/mediastreamhandler.h",
-      "source/talk/app/webrtc/mediastreaminterface.h",
-      "source/talk/app/webrtc/mediastreamobserver.cc",
-      "source/talk/app/webrtc/mediastreamobserver.h",
-      "source/talk/app/webrtc/mediastreamprovider.h",
-      "source/talk/app/webrtc/mediastreamproxy.h",
-      "source/talk/app/webrtc/mediastreamtrack.h",
-      "source/talk/app/webrtc/mediastreamtrackproxy.h",
-      "source/talk/app/webrtc/notifier.h",
-      "source/talk/app/webrtc/peerconnection.cc",
-      "source/talk/app/webrtc/peerconnection.h",
-      "source/talk/app/webrtc/peerconnectionfactory.cc",
-      "source/talk/app/webrtc/peerconnectionfactory.h",
-      "source/talk/app/webrtc/peerconnectioninterface.h",
-      "source/talk/app/webrtc/portallocatorfactory.cc",
-      "source/talk/app/webrtc/portallocatorfactory.h",
-      "source/talk/app/webrtc/remoteaudiosource.cc",
-      "source/talk/app/webrtc/remoteaudiosource.h",
-      "source/talk/app/webrtc/remoteaudiotrack.cc",
-      "source/talk/app/webrtc/remoteaudiotrack.h",
-      "source/talk/app/webrtc/remotevideocapturer.cc",
-      "source/talk/app/webrtc/remotevideocapturer.h",
-      "source/talk/app/webrtc/rtpreceiver.cc",
-      "source/talk/app/webrtc/rtpreceiver.h",
-      "source/talk/app/webrtc/rtpreceiverinterface.h",
-      "source/talk/app/webrtc/rtpsender.cc",
-      "source/talk/app/webrtc/rtpsender.h",
-      "source/talk/app/webrtc/rtpsenderinterface.h",
-      "source/talk/app/webrtc/sctputils.cc",
-      "source/talk/app/webrtc/sctputils.h",
-      "source/talk/app/webrtc/statscollector.cc",
-      "source/talk/app/webrtc/statscollector.h",
-      "source/talk/app/webrtc/statstypes.cc",
-      "source/talk/app/webrtc/statstypes.h",
-      "source/talk/app/webrtc/streamcollection.h",
-      "source/talk/app/webrtc/umametrics.h",
-      "source/talk/app/webrtc/videosource.cc",
-      "source/talk/app/webrtc/videosource.h",
-      "source/talk/app/webrtc/videosourceinterface.h",
-      "source/talk/app/webrtc/videosourceproxy.h",
-      "source/talk/app/webrtc/videotrack.cc",
-      "source/talk/app/webrtc/videotrack.h",
-      "source/talk/app/webrtc/videotrackrenderers.cc",
-      "source/talk/app/webrtc/videotrackrenderers.h",
-      "source/talk/app/webrtc/webrtcsdp.cc",
-      "source/talk/app/webrtc/webrtcsdp.h",
-      "source/talk/app/webrtc/webrtcsession.cc",
-      "source/talk/app/webrtc/webrtcsession.h",
-      "source/talk/app/webrtc/webrtcsessiondescriptionfactory.cc",
-      "source/talk/app/webrtc/webrtcsessiondescriptionfactory.h",
       "source/talk/session/media/audiomonitor.cc",
       "source/talk/session/media/audiomonitor.h",
       "source/talk/session/media/bundlefilter.cc",
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium
index af65653..63591ad 100644
--- a/third_party/libjingle/README.chromium
+++ b/third_party/libjingle/README.chromium
@@ -1,7 +1,7 @@
 Name: libjingle
 URL: http://www.webrtc.org
 Version: unknown
-Revision: 11522
+Revision: 11545
 License: BSD
 License File: source/talk/COPYING
 Security Critical: yes
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index a079f01..c2d7352 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -256,6 +256,78 @@
           'target_name': 'libjingle_webrtc_common',
           'type': 'static_library',
           'sources': [
+            '<(DEPTH)/third_party/webrtc/api/audiotrack.cc',
+            '<(DEPTH)/third_party/webrtc/api/audiotrack.h',
+            '<(DEPTH)/third_party/webrtc/api/datachannel.cc',
+            '<(DEPTH)/third_party/webrtc/api/datachannel.h',
+            '<(DEPTH)/third_party/webrtc/api/dtlsidentitystore.cc',
+            '<(DEPTH)/third_party/webrtc/api/dtlsidentitystore.h',
+            '<(DEPTH)/third_party/webrtc/api/dtmfsender.cc',
+            '<(DEPTH)/third_party/webrtc/api/dtmfsender.h',
+            '<(DEPTH)/third_party/webrtc/api/jsep.h',
+            '<(DEPTH)/third_party/webrtc/api/jsepicecandidate.cc',
+            '<(DEPTH)/third_party/webrtc/api/jsepicecandidate.h',
+            '<(DEPTH)/third_party/webrtc/api/jsepsessiondescription.cc',
+            '<(DEPTH)/third_party/webrtc/api/jsepsessiondescription.h',
+            '<(DEPTH)/third_party/webrtc/api/localaudiosource.cc',
+            '<(DEPTH)/third_party/webrtc/api/localaudiosource.h',
+            '<(DEPTH)/third_party/webrtc/api/mediaconstraintsinterface.cc',
+            '<(DEPTH)/third_party/webrtc/api/mediaconstraintsinterface.h',
+            '<(DEPTH)/third_party/webrtc/api/mediacontroller.cc',
+            '<(DEPTH)/third_party/webrtc/api/mediacontroller.h',
+            '<(DEPTH)/third_party/webrtc/api/mediastream.cc',
+            '<(DEPTH)/third_party/webrtc/api/mediastream.h',
+            '<(DEPTH)/third_party/webrtc/api/mediastreamhandler.cc',
+            '<(DEPTH)/third_party/webrtc/api/mediastreamhandler.h',
+            '<(DEPTH)/third_party/webrtc/api/mediastreaminterface.h',
+            '<(DEPTH)/third_party/webrtc/api/mediastreamobserver.cc',
+            '<(DEPTH)/third_party/webrtc/api/mediastreamobserver.h',
+            '<(DEPTH)/third_party/webrtc/api/mediastreamprovider.h',
+            '<(DEPTH)/third_party/webrtc/api/mediastreamproxy.h',
+            '<(DEPTH)/third_party/webrtc/api/mediastreamtrack.h',
+            '<(DEPTH)/third_party/webrtc/api/mediastreamtrackproxy.h',
+            '<(DEPTH)/third_party/webrtc/api/notifier.h',
+            '<(DEPTH)/third_party/webrtc/api/peerconnection.cc',
+            '<(DEPTH)/third_party/webrtc/api/peerconnection.h',
+            '<(DEPTH)/third_party/webrtc/api/peerconnectionfactory.cc',
+            '<(DEPTH)/third_party/webrtc/api/peerconnectionfactory.h',
+            '<(DEPTH)/third_party/webrtc/api/peerconnectioninterface.h',
+            '<(DEPTH)/third_party/webrtc/api/portallocatorfactory.cc',
+            '<(DEPTH)/third_party/webrtc/api/portallocatorfactory.h',
+            '<(DEPTH)/third_party/webrtc/api/remoteaudiosource.cc',
+            '<(DEPTH)/third_party/webrtc/api/remoteaudiosource.h',
+            '<(DEPTH)/third_party/webrtc/api/remoteaudiotrack.cc',
+            '<(DEPTH)/third_party/webrtc/api/remoteaudiotrack.h',
+            '<(DEPTH)/third_party/webrtc/api/remotevideocapturer.cc',
+            '<(DEPTH)/third_party/webrtc/api/remotevideocapturer.h',
+            '<(DEPTH)/third_party/webrtc/api/rtpreceiver.cc',
+            '<(DEPTH)/third_party/webrtc/api/rtpreceiver.h',
+            '<(DEPTH)/third_party/webrtc/api/rtpreceiverinterface.h',
+            '<(DEPTH)/third_party/webrtc/api/rtpsender.cc',
+            '<(DEPTH)/third_party/webrtc/api/rtpsender.h',
+            '<(DEPTH)/third_party/webrtc/api/rtpsenderinterface.h',
+            '<(DEPTH)/third_party/webrtc/api/sctputils.cc',
+            '<(DEPTH)/third_party/webrtc/api/sctputils.h',
+            '<(DEPTH)/third_party/webrtc/api/statscollector.cc',
+            '<(DEPTH)/third_party/webrtc/api/statscollector.h',
+            '<(DEPTH)/third_party/webrtc/api/statstypes.cc',
+            '<(DEPTH)/third_party/webrtc/api/statstypes.h',
+            '<(DEPTH)/third_party/webrtc/api/streamcollection.h',
+            '<(DEPTH)/third_party/webrtc/api/umametrics.h',
+            '<(DEPTH)/third_party/webrtc/api/videosource.cc',
+            '<(DEPTH)/third_party/webrtc/api/videosource.h',
+            '<(DEPTH)/third_party/webrtc/api/videosourceinterface.h',
+            '<(DEPTH)/third_party/webrtc/api/videosourceproxy.h',
+            '<(DEPTH)/third_party/webrtc/api/videotrack.cc',
+            '<(DEPTH)/third_party/webrtc/api/videotrack.h',
+            '<(DEPTH)/third_party/webrtc/api/videotrackrenderers.cc',
+            '<(DEPTH)/third_party/webrtc/api/videotrackrenderers.h',
+            '<(DEPTH)/third_party/webrtc/api/webrtcsdp.cc',
+            '<(DEPTH)/third_party/webrtc/api/webrtcsdp.h',
+            '<(DEPTH)/third_party/webrtc/api/webrtcsession.cc',
+            '<(DEPTH)/third_party/webrtc/api/webrtcsession.h',
+            '<(DEPTH)/third_party/webrtc/api/webrtcsessiondescriptionfactory.cc',
+            '<(DEPTH)/third_party/webrtc/api/webrtcsessiondescriptionfactory.h',
             '<(DEPTH)/third_party/webrtc/media/base/audiorenderer.h',
             '<(DEPTH)/third_party/webrtc/media/base/capturemanager.cc',
             '<(DEPTH)/third_party/webrtc/media/base/capturemanager.h',
@@ -298,78 +370,6 @@
             '<(DEPTH)/third_party/webrtc/media/webrtc/webrtcvideoframefactory.cc',
             '<(DEPTH)/third_party/webrtc/media/webrtc/webrtcvideoframefactory.h',
             '<(DEPTH)/third_party/webrtc/media/webrtc/webrtcvoe.h',
-            '<(libjingle_source)/talk/app/webrtc/audiotrack.cc',
-            '<(libjingle_source)/talk/app/webrtc/audiotrack.h',
-            '<(libjingle_source)/talk/app/webrtc/datachannel.cc',
-            '<(libjingle_source)/talk/app/webrtc/datachannel.h',
-            '<(libjingle_source)/talk/app/webrtc/dtlsidentitystore.cc',
-            '<(libjingle_source)/talk/app/webrtc/dtlsidentitystore.h',
-            '<(libjingle_source)/talk/app/webrtc/dtmfsender.cc',
-            '<(libjingle_source)/talk/app/webrtc/dtmfsender.h',
-            '<(libjingle_source)/talk/app/webrtc/jsep.h',
-            '<(libjingle_source)/talk/app/webrtc/jsepicecandidate.cc',
-            '<(libjingle_source)/talk/app/webrtc/jsepicecandidate.h',
-            '<(libjingle_source)/talk/app/webrtc/jsepsessiondescription.cc',
-            '<(libjingle_source)/talk/app/webrtc/jsepsessiondescription.h',
-            '<(libjingle_source)/talk/app/webrtc/localaudiosource.cc',
-            '<(libjingle_source)/talk/app/webrtc/localaudiosource.h',
-            '<(libjingle_source)/talk/app/webrtc/mediaconstraintsinterface.cc',
-            '<(libjingle_source)/talk/app/webrtc/mediaconstraintsinterface.h',
-            '<(libjingle_source)/talk/app/webrtc/mediacontroller.cc',
-            '<(libjingle_source)/talk/app/webrtc/mediacontroller.h',
-            '<(libjingle_source)/talk/app/webrtc/mediastream.cc',
-            '<(libjingle_source)/talk/app/webrtc/mediastream.h',
-            '<(libjingle_source)/talk/app/webrtc/mediastreamhandler.cc',
-            '<(libjingle_source)/talk/app/webrtc/mediastreamhandler.h',
-            '<(libjingle_source)/talk/app/webrtc/mediastreaminterface.h',
-            '<(libjingle_source)/talk/app/webrtc/mediastreamobserver.cc',
-            '<(libjingle_source)/talk/app/webrtc/mediastreamobserver.h',
-            '<(libjingle_source)/talk/app/webrtc/mediastreamprovider.h',
-            '<(libjingle_source)/talk/app/webrtc/mediastreamproxy.h',
-            '<(libjingle_source)/talk/app/webrtc/mediastreamtrack.h',
-            '<(libjingle_source)/talk/app/webrtc/mediastreamtrackproxy.h',
-            '<(libjingle_source)/talk/app/webrtc/notifier.h',
-            '<(libjingle_source)/talk/app/webrtc/peerconnection.cc',
-            '<(libjingle_source)/talk/app/webrtc/peerconnection.h',
-            '<(libjingle_source)/talk/app/webrtc/peerconnectionfactory.cc',
-            '<(libjingle_source)/talk/app/webrtc/peerconnectionfactory.h',
-            '<(libjingle_source)/talk/app/webrtc/peerconnectioninterface.h',
-            '<(libjingle_source)/talk/app/webrtc/portallocatorfactory.cc',
-            '<(libjingle_source)/talk/app/webrtc/portallocatorfactory.h',
-            '<(libjingle_source)/talk/app/webrtc/remoteaudiosource.cc',
-            '<(libjingle_source)/talk/app/webrtc/remoteaudiosource.h',
-            '<(libjingle_source)/talk/app/webrtc/remoteaudiotrack.cc',
-            '<(libjingle_source)/talk/app/webrtc/remoteaudiotrack.h',
-            '<(libjingle_source)/talk/app/webrtc/remotevideocapturer.cc',
-            '<(libjingle_source)/talk/app/webrtc/remotevideocapturer.h',
-            '<(libjingle_source)/talk/app/webrtc/rtpreceiver.cc',
-            '<(libjingle_source)/talk/app/webrtc/rtpreceiver.h',
-            '<(libjingle_source)/talk/app/webrtc/rtpreceiverinterface.h',
-            '<(libjingle_source)/talk/app/webrtc/rtpsender.cc',
-            '<(libjingle_source)/talk/app/webrtc/rtpsender.h',
-            '<(libjingle_source)/talk/app/webrtc/rtpsenderinterface.h',
-            '<(libjingle_source)/talk/app/webrtc/sctputils.cc',
-            '<(libjingle_source)/talk/app/webrtc/sctputils.h',
-            '<(libjingle_source)/talk/app/webrtc/statscollector.cc',
-            '<(libjingle_source)/talk/app/webrtc/statscollector.h',
-            '<(libjingle_source)/talk/app/webrtc/statstypes.cc',
-            '<(libjingle_source)/talk/app/webrtc/statstypes.h',
-            '<(libjingle_source)/talk/app/webrtc/streamcollection.h',
-            '<(libjingle_source)/talk/app/webrtc/umametrics.h',
-            '<(libjingle_source)/talk/app/webrtc/videosource.cc',
-            '<(libjingle_source)/talk/app/webrtc/videosource.h',
-            '<(libjingle_source)/talk/app/webrtc/videosourceinterface.h',
-            '<(libjingle_source)/talk/app/webrtc/videosourceproxy.h',
-            '<(libjingle_source)/talk/app/webrtc/videotrack.cc',
-            '<(libjingle_source)/talk/app/webrtc/videotrack.h',
-            '<(libjingle_source)/talk/app/webrtc/videotrackrenderers.cc',
-            '<(libjingle_source)/talk/app/webrtc/videotrackrenderers.h',
-            '<(libjingle_source)/talk/app/webrtc/webrtcsdp.cc',
-            '<(libjingle_source)/talk/app/webrtc/webrtcsdp.h',
-            '<(libjingle_source)/talk/app/webrtc/webrtcsession.cc',
-            '<(libjingle_source)/talk/app/webrtc/webrtcsession.h',
-            '<(libjingle_source)/talk/app/webrtc/webrtcsessiondescriptionfactory.cc',
-            '<(libjingle_source)/talk/app/webrtc/webrtcsessiondescriptionfactory.h',
             '<(libjingle_source)/talk/session/media/audiomonitor.cc',
             '<(libjingle_source)/talk/session/media/audiomonitor.h',
             '<(libjingle_source)/talk/session/media/bundlefilter.cc',