Roll WebRTC 11579:11592, Libjingle 11568:11592

Update libjingle GYP+GN files for:
    * talk/session/media -> webrtc/pc move.
    * webrtc/media/webrtc -> webrtc/media/engine rename.

WebRTC 11579:11592
Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/4ba95f2..4056bb6

Libjingle 11568:11592
Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/a60ab43..761433d

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

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

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

3 files changed, 73 insertions, 73 deletions

diff --git a/third_party/libjingle/BUILD.gn b/third_party/libjingle/BUILD.gn
index be97212..3d930c0 100644
--- a/third_party/libjingle/BUILD.gn
+++ b/third_party/libjingle/BUILD.gn
@@ -404,34 +404,34 @@ if (enable_webrtc) {
       "../webrtc/media/base/videoframefactory.h",
       "../webrtc/media/devices/dummydevicemanager.cc",
       "../webrtc/media/devices/dummydevicemanager.h",
-      "../webrtc/media/webrtc/webrtccommon.h",
-      "../webrtc/media/webrtc/webrtcvideoframe.cc",
-      "../webrtc/media/webrtc/webrtcvideoframe.h",
-      "../webrtc/media/webrtc/webrtcvideoframefactory.cc",
-      "../webrtc/media/webrtc/webrtcvideoframefactory.h",
-      "../webrtc/media/webrtc/webrtcvoe.h",
-      "source/talk/session/media/audiomonitor.cc",
-      "source/talk/session/media/audiomonitor.h",
-      "source/talk/session/media/bundlefilter.cc",
-      "source/talk/session/media/bundlefilter.h",
-      "source/talk/session/media/channel.cc",
-      "source/talk/session/media/channel.h",
-      "source/talk/session/media/channelmanager.cc",
-      "source/talk/session/media/channelmanager.h",
-      "source/talk/session/media/currentspeakermonitor.cc",
-      "source/talk/session/media/currentspeakermonitor.h",
-      "source/talk/session/media/externalhmac.cc",
-      "source/talk/session/media/externalhmac.h",
-      "source/talk/session/media/mediamonitor.cc",
-      "source/talk/session/media/mediamonitor.h",
-      "source/talk/session/media/mediasession.cc",
-      "source/talk/session/media/mediasession.h",
-      "source/talk/session/media/mediasink.h",
-      "source/talk/session/media/rtcpmuxfilter.cc",
-      "source/talk/session/media/rtcpmuxfilter.h",
-      "source/talk/session/media/srtpfilter.cc",
-      "source/talk/session/media/srtpfilter.h",
-      "source/talk/session/media/voicechannel.h",
+      "../webrtc/media/engine/webrtccommon.h",
+      "../webrtc/media/engine/webrtcvideoframe.cc",
+      "../webrtc/media/engine/webrtcvideoframe.h",
+      "../webrtc/media/engine/webrtcvideoframefactory.cc",
+      "../webrtc/media/engine/webrtcvideoframefactory.h",
+      "../webrtc/media/engine/webrtcvoe.h",
+      "../webrtc/pc/audiomonitor.cc",
+      "../webrtc/pc/audiomonitor.h",
+      "../webrtc/pc/bundlefilter.cc",
+      "../webrtc/pc/bundlefilter.h",
+      "../webrtc/pc/channel.cc",
+      "../webrtc/pc/channel.h",
+      "../webrtc/pc/channelmanager.cc",
+      "../webrtc/pc/channelmanager.h",
+      "../webrtc/pc/currentspeakermonitor.cc",
+      "../webrtc/pc/currentspeakermonitor.h",
+      "../webrtc/pc/externalhmac.cc",
+      "../webrtc/pc/externalhmac.h",
+      "../webrtc/pc/mediamonitor.cc",
+      "../webrtc/pc/mediamonitor.h",
+      "../webrtc/pc/mediasession.cc",
+      "../webrtc/pc/mediasession.h",
+      "../webrtc/pc/mediasink.h",
+      "../webrtc/pc/rtcpmuxfilter.cc",
+      "../webrtc/pc/rtcpmuxfilter.h",
+      "../webrtc/pc/srtpfilter.cc",
+      "../webrtc/pc/srtpfilter.h",
+      "../webrtc/pc/voicechannel.h",
     ]
 
     configs -= [ "//build/config/compiler:chromium_code" ]
@@ -463,14 +463,14 @@ if (enable_webrtc) {
   # as is supported in the GYP build. It's not clear what this is used for.
   source_set("libpeerconnection") {
     sources = [
-      "../webrtc/media/webrtc/simulcast.cc",
-      "../webrtc/media/webrtc/simulcast.h",
-      "../webrtc/media/webrtc/webrtcmediaengine.cc",
-      "../webrtc/media/webrtc/webrtcmediaengine.h",
-      "../webrtc/media/webrtc/webrtcvideoengine2.cc",
-      "../webrtc/media/webrtc/webrtcvideoengine2.h",
-      "../webrtc/media/webrtc/webrtcvoiceengine.cc",
-      "../webrtc/media/webrtc/webrtcvoiceengine.h",
+      "../webrtc/media/engine/simulcast.cc",
+      "../webrtc/media/engine/simulcast.h",
+      "../webrtc/media/engine/webrtcmediaengine.cc",
+      "../webrtc/media/engine/webrtcmediaengine.h",
+      "../webrtc/media/engine/webrtcvideoengine2.cc",
+      "../webrtc/media/engine/webrtcvideoengine2.h",
+      "../webrtc/media/engine/webrtcvoiceengine.cc",
+      "../webrtc/media/engine/webrtcvoiceengine.h",
     ]
 
     configs += [ ":jingle_unexported_configs" ]
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium
index 635586a..48b86cd 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: 11568
+Revision: 11592
 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 925c85d..d5c8149 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -366,34 +366,34 @@
             '<(DEPTH)/third_party/webrtc/media/base/videoframefactory.h',
             '<(DEPTH)/third_party/webrtc/media/devices/dummydevicemanager.cc',
             '<(DEPTH)/third_party/webrtc/media/devices/dummydevicemanager.h',
-            '<(DEPTH)/third_party/webrtc/media/webrtc/webrtccommon.h',
-            '<(DEPTH)/third_party/webrtc/media/webrtc/webrtcvideoframe.cc',
-            '<(DEPTH)/third_party/webrtc/media/webrtc/webrtcvideoframe.h',
-            '<(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/session/media/audiomonitor.cc',
-            '<(libjingle_source)/talk/session/media/audiomonitor.h',
-            '<(libjingle_source)/talk/session/media/bundlefilter.cc',
-            '<(libjingle_source)/talk/session/media/bundlefilter.h',
-            '<(libjingle_source)/talk/session/media/channel.cc',
-            '<(libjingle_source)/talk/session/media/channel.h',
-            '<(libjingle_source)/talk/session/media/channelmanager.cc',
-            '<(libjingle_source)/talk/session/media/channelmanager.h',
-            '<(libjingle_source)/talk/session/media/currentspeakermonitor.cc',
-            '<(libjingle_source)/talk/session/media/currentspeakermonitor.h',
-            '<(libjingle_source)/talk/session/media/externalhmac.cc',
-            '<(libjingle_source)/talk/session/media/externalhmac.h',
-            '<(libjingle_source)/talk/session/media/mediamonitor.cc',
-            '<(libjingle_source)/talk/session/media/mediamonitor.h',
-            '<(libjingle_source)/talk/session/media/mediasession.cc',
-            '<(libjingle_source)/talk/session/media/mediasession.h',
-            '<(libjingle_source)/talk/session/media/mediasink.h',
-            '<(libjingle_source)/talk/session/media/rtcpmuxfilter.cc',
-            '<(libjingle_source)/talk/session/media/rtcpmuxfilter.h',
-            '<(libjingle_source)/talk/session/media/srtpfilter.cc',
-            '<(libjingle_source)/talk/session/media/srtpfilter.h',
-            '<(libjingle_source)/talk/session/media/voicechannel.h',
+            '<(DEPTH)/third_party/webrtc/media/engine/webrtccommon.h',
+            '<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoframe.cc',
+            '<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoframe.h',
+            '<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoframefactory.cc',
+            '<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoframefactory.h',
+            '<(DEPTH)/third_party/webrtc/media/engine/webrtcvoe.h',
+            '<(DEPTH)/third_party/webrtc/pc/audiomonitor.cc',
+            '<(DEPTH)/third_party/webrtc/pc/audiomonitor.h',
+            '<(DEPTH)/third_party/webrtc/pc/bundlefilter.cc',
+            '<(DEPTH)/third_party/webrtc/pc/bundlefilter.h',
+            '<(DEPTH)/third_party/webrtc/pc/channel.cc',
+            '<(DEPTH)/third_party/webrtc/pc/channel.h',
+            '<(DEPTH)/third_party/webrtc/pc/channelmanager.cc',
+            '<(DEPTH)/third_party/webrtc/pc/channelmanager.h',
+            '<(DEPTH)/third_party/webrtc/pc/currentspeakermonitor.cc',
+            '<(DEPTH)/third_party/webrtc/pc/currentspeakermonitor.h',
+            '<(DEPTH)/third_party/webrtc/pc/externalhmac.cc',
+            '<(DEPTH)/third_party/webrtc/pc/externalhmac.h',
+            '<(DEPTH)/third_party/webrtc/pc/mediamonitor.cc',
+            '<(DEPTH)/third_party/webrtc/pc/mediamonitor.h',
+            '<(DEPTH)/third_party/webrtc/pc/mediasession.cc',
+            '<(DEPTH)/third_party/webrtc/pc/mediasession.h',
+            '<(DEPTH)/third_party/webrtc/pc/mediasink.h',
+            '<(DEPTH)/third_party/webrtc/pc/rtcpmuxfilter.cc',
+            '<(DEPTH)/third_party/webrtc/pc/rtcpmuxfilter.h',
+            '<(DEPTH)/third_party/webrtc/pc/srtpfilter.cc',
+            '<(DEPTH)/third_party/webrtc/pc/srtpfilter.h',
+            '<(DEPTH)/third_party/webrtc/pc/voicechannel.h',
           ],
           'conditions': [
             # TODO(mallinath) - Enable SCTP for iOS.
@@ -482,14 +482,14 @@
           'type': 'static_library',
           'sources': [
             # Note: sources list duplicated in GN build.
-            '<(DEPTH)/third_party/webrtc/media/webrtc/simulcast.cc',
-            '<(DEPTH)/third_party/webrtc/media/webrtc/simulcast.h',
-            '<(DEPTH)/third_party/webrtc/media/webrtc/webrtcmediaengine.cc',
-            '<(DEPTH)/third_party/webrtc/media/webrtc/webrtcmediaengine.h',
-            '<(DEPTH)/third_party/webrtc/media/webrtc/webrtcvideoengine2.cc',
-            '<(DEPTH)/third_party/webrtc/media/webrtc/webrtcvideoengine2.h',
-            '<(DEPTH)/third_party/webrtc/media/webrtc/webrtcvoiceengine.cc',
-            '<(DEPTH)/third_party/webrtc/media/webrtc/webrtcvoiceengine.h',
+            '<(DEPTH)/third_party/webrtc/media/engine/simulcast.cc',
+            '<(DEPTH)/third_party/webrtc/media/engine/simulcast.h',
+            '<(DEPTH)/third_party/webrtc/media/engine/webrtcmediaengine.cc',
+            '<(DEPTH)/third_party/webrtc/media/engine/webrtcmediaengine.h',
+            '<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoengine2.cc',
+            '<(DEPTH)/third_party/webrtc/media/engine/webrtcvideoengine2.h',
+            '<(DEPTH)/third_party/webrtc/media/engine/webrtcvoiceengine.cc',
+            '<(DEPTH)/third_party/webrtc/media/engine/webrtcvoiceengine.h',
           ],
           'dependencies': [
             '<(DEPTH)/third_party/webrtc/voice_engine/voice_engine.gyp:voice_engine',