From e30f12803b16cd8d2b40a5d1d3e8ddb827a4db5e Mon Sep 17 00:00:00 2001
From: pthatcher <pthatcher@chromium.org>
Date: Wed, 15 Apr 2015 00:21:27 -0700
Subject: [PATCH] Roll WebRTC 8989:8999, Libjingle 8990:8994

WebRTC 8989:8999
Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/5ffd4ec..b74b769

Libjingle 8990:8994
Changes: https://chromium.googlesource.com/external/webrtc/trunk/talk.git/+log/d872289..2a568fa

And remove some deleted files from build files.

TBR=
BUG=

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

Cr-Commit-Position: refs/heads/master@{#325203}
---
 DEPS                                        | 4 ++--
 third_party/libjingle/BUILD.gn              | 4 ----
 third_party/libjingle/README.chromium       | 2 +-
 third_party/libjingle/libjingle_common.gypi | 4 ----
 4 files changed, 3 insertions(+), 11 deletions(-)

diff --git a/DEPS b/DEPS
index 86c4249ad47a..d5849f20018c 100644
--- a/DEPS
+++ b/DEPS
@@ -210,7 +210,7 @@ deps = {
    Var('chromium_git') + '/chromium/third_party/ffmpeg.git' + '@' + '104f872faf2cd809cdada885a1e39be85e5b3316',
 
   'src/third_party/libjingle/source/talk':
-    Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + 'd872289cd2805dba53009a17543221ce50220ea1',
+    Var('chromium_git') + '/external/webrtc/trunk/talk.git' + '@' + '2a568fa14fbbfde2ff04a3ec53648b900128b1cf', # commit position 8994
 
   'src/third_party/usrsctp/usrsctplib':
     Var('chromium_git') + '/external/usrsctplib.git' + '@' + '36444a999739e9e408f8f587cb4c3ffeef2e50ac', # from svn revision 9215
@@ -234,7 +234,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' + '@' + '5ffd4ec78c21a89fd4926d561315e3c699a5021a',
+    Var('chromium_git') + '/external/webrtc/trunk/webrtc.git' + '@' + 'b74b7698d8fb7421999015d483ae929632aaba7c', # commit position 8999
 
   'src/third_party/openmax_dl':
     Var('chromium_git') + '/external/webrtc/deps/third_party/openmax.git' + '@' +  Var('openmax_dl_revision'),
diff --git a/third_party/libjingle/BUILD.gn b/third_party/libjingle/BUILD.gn
index 51a3c2a124aa..99fadfbc0f59 100644
--- a/third_party/libjingle/BUILD.gn
+++ b/third_party/libjingle/BUILD.gn
@@ -167,10 +167,6 @@ static_library("libjingle") {
     "$p2p_dir/base/port.h",
     "$p2p_dir/base/portallocator.cc",
     "$p2p_dir/base/portallocator.h",
-    "$p2p_dir/base/portallocatorsessionproxy.cc",
-    "$p2p_dir/base/portallocatorsessionproxy.h",
-    "$p2p_dir/base/portproxy.cc",
-    "$p2p_dir/base/portproxy.h",
     "$p2p_dir/base/pseudotcp.cc",
     "$p2p_dir/base/pseudotcp.h",
     "$p2p_dir/base/rawtransport.cc",
diff --git a/third_party/libjingle/README.chromium b/third_party/libjingle/README.chromium
index ccab606649fa..cc0f7a9faa9b 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: 8990
+Revision: 8994
 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 b9ee42c29000..26b0ad588028 100644
--- a/third_party/libjingle/libjingle_common.gypi
+++ b/third_party/libjingle/libjingle_common.gypi
@@ -28,10 +28,6 @@
     '<(webrtc_p2p)/base/port.h',
     '<(webrtc_p2p)/base/portallocator.cc',
     '<(webrtc_p2p)/base/portallocator.h',
-    '<(webrtc_p2p)/base/portallocatorsessionproxy.cc',
-    '<(webrtc_p2p)/base/portallocatorsessionproxy.h',
-    '<(webrtc_p2p)/base/portproxy.cc',
-    '<(webrtc_p2p)/base/portproxy.h',
     '<(webrtc_p2p)/base/pseudotcp.cc',
     '<(webrtc_p2p)/base/pseudotcp.h',
     '<(webrtc_p2p)/base/rawtransport.cc',
-- 
2.11.4.GIT