Roll WebRTC 11835:11842

WebRTC 11835:11842

Changes: https://chromium.googlesource.com/external/webrtc/trunk/webrtc.git/+log/f749695..5ec6244

This updates Chromium to match the changes done in
https://codereview.webrtc.org/1750593002/
It allows removing a couple of ugly GYP hacks.

BUG=webrtc:4256
TBR=sergeyu@chromium.org

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

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

4 files changed, 8 insertions, 84 deletions

diff --git a/third_party/libjingle/BUILD.gn b/third_party/libjingle/BUILD.gn
index 6174810..1c3e5f9 100644
--- a/third_party/libjingle/BUILD.gn
+++ b/third_party/libjingle/BUILD.gn
@@ -127,11 +127,11 @@ static_library("libjingle") {
     "$p2p_dir/base/basicpacketsocketfactory.h",
     "$p2p_dir/base/candidate.h",
     "$p2p_dir/base/common.h",
-    "$p2p_dir/base/constants.cc",
-    "$p2p_dir/base/constants.h",
     "$p2p_dir/base/dtlstransport.h",
     "$p2p_dir/base/dtlstransportchannel.cc",
     "$p2p_dir/base/dtlstransportchannel.h",
+    "$p2p_dir/base/p2pconstants.cc",
+    "$p2p_dir/base/p2pconstants.h",
     "$p2p_dir/base/p2ptransport.cc",
     "$p2p_dir/base/p2ptransport.h",
     "$p2p_dir/base/p2ptransportchannel.cc",
@@ -220,11 +220,6 @@ static_library("libjingle") {
     "$xmpp_dir/xmpptask.cc",
     "$xmpp_dir/xmpptask.h",
   ]
-  sources -= [
-    # Compiled as part of libjingle_p2p_constants.
-    "$p2p_dir/base/constants.cc",
-    "$p2p_dir/base/constants.h",
-  ]
 
   # TODO(jschuh): crbug.com/167187 fix size_t to int truncations.
   configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
@@ -233,7 +228,6 @@ static_library("libjingle") {
     ":jingle_deps",
   ]
   deps = [
-    ":libjingle_p2p_constants",
     "//third_party/webrtc/base:rtc_base",
   ]
 
@@ -257,28 +251,6 @@ static_library("libjingle") {
   public_configs = [ ":jingle_public_configs" ]
 }
 
-# This has to be is a separate project due to a bug in MSVS 2008 and the
-# current toolset on android.  The problem is that we have two files named
-# "constants.cc" and MSVS/android doesn't handle this properly.
-# GYP currently has guards to catch this, so if you want to remove it,
-# run GYP and if GYP has removed the validation check, then we can assume
-# that the toolchains have been fixed (we currently use VS2010 and later,
-# so VS2008 isn't a concern anymore).
-#
-# GYP version: third_party/libjingle.gyp:libjingle_p2p_constants
-static_library("libjingle_p2p_constants") {
-  p2p_dir = "../webrtc/p2p"
-  sources = [
-    "$p2p_dir/base/constants.cc",
-    "$p2p_dir/base/constants.h",
-  ]
-  public_deps = [
-    ":jingle_deps",
-  ]
-  configs += [ ":jingle_unexported_configs" ]
-  public_configs = [ ":jingle_public_configs" ]
-}
-
 if (enable_webrtc) {
   source_set("libjingle_webrtc") {
     sources = [
@@ -373,11 +345,11 @@ if (enable_webrtc) {
       "../webrtc/media/base/capturerenderadapter.h",
       "../webrtc/media/base/codec.cc",
       "../webrtc/media/base/codec.h",
-      "../webrtc/media/base/constants.cc",
-      "../webrtc/media/base/constants.h",
       "../webrtc/media/base/cryptoparams.h",
       "../webrtc/media/base/hybriddataengine.h",
       "../webrtc/media/base/mediachannel.h",
+      "../webrtc/media/base/mediaconstants.cc",
+      "../webrtc/media/base/mediaconstants.h",
       "../webrtc/media/base/mediaengine.cc",
       "../webrtc/media/base/mediaengine.h",
       "../webrtc/media/base/rtpdataengine.cc",
diff --git a/third_party/libjingle/libjingle.gyp b/third_party/libjingle/libjingle.gyp
index 3793064..6edf17f 100644
--- a/third_party/libjingle/libjingle.gyp
+++ b/third_party/libjingle/libjingle.gyp
@@ -10,7 +10,6 @@
     'libjingle_additional_deps%': [],
     'libjingle_peerconnection_additional_deps%': [],
     'libjingle_source%': "source",
-    'webrtc_p2p': "../webrtc/p2p",
     'webrtc_xmpp': "../webrtc/libjingle/xmpp",
   },
   # Most of these settings have been split according to their scope into
@@ -217,35 +216,12 @@
       'target_name': 'libjingle',
       'type': 'static_library',
       'includes': [ 'libjingle_common.gypi' ],
-      'sources!' : [
-        # Compiled as part of libjingle_p2p_constants.
-        '<(webrtc_p2p)/base/constants.cc',
-        '<(webrtc_p2p)/base/constants.h',
-      ],
       'dependencies': [
         '<(DEPTH)/third_party/webrtc/base/base.gyp:rtc_base',
         '<(DEPTH)/third_party/webrtc/libjingle/xmllite/xmllite.gyp:rtc_xmllite',
-        'libjingle_p2p_constants',
         '<@(libjingle_additional_deps)',
       ],
     },  # target libjingle
-    # This has to be is a separate project due to a bug in MSVS 2008 and the
-    # current toolset on android.  The problem is that we have two files named
-    # "constants.cc" and MSVS/android doesn't handle this properly.
-    # GYP currently has guards to catch this, so if you want to remove it,
-    # run GYP and if GYP has removed the validation check, then we can assume
-    # that the toolchains have been fixed (we currently use VS2010 and later,
-    # so VS2008 isn't a concern anymore).
-    #
-    # GN version: //third_party/libjingle:libjingle_p2p_constants
-    {
-      'target_name': 'libjingle_p2p_constants',
-      'type': 'static_library',
-      'sources': [
-        '<(webrtc_p2p)/base/constants.cc',
-        '<(webrtc_p2p)/base/constants.h',
-      ],
-    },  # target libjingle_p2p_constants
   ],
   'conditions': [
     ['enable_webrtc==1', {
@@ -334,11 +310,11 @@
             '<(DEPTH)/third_party/webrtc/media/base/capturerenderadapter.h',
             '<(DEPTH)/third_party/webrtc/media/base/codec.cc',
             '<(DEPTH)/third_party/webrtc/media/base/codec.h',
-            '<(DEPTH)/third_party/webrtc/media/base/constants.cc',
-            '<(DEPTH)/third_party/webrtc/media/base/constants.h',
             '<(DEPTH)/third_party/webrtc/media/base/cryptoparams.h',
             '<(DEPTH)/third_party/webrtc/media/base/hybriddataengine.h',
             '<(DEPTH)/third_party/webrtc/media/base/mediachannel.h',
+            '<(DEPTH)/third_party/webrtc/media/base/mediaconstants.cc',
+            '<(DEPTH)/third_party/webrtc/media/base/mediaconstants.h',
             '<(DEPTH)/third_party/webrtc/media/base/mediaengine.cc',
             '<(DEPTH)/third_party/webrtc/media/base/mediaengine.h',
             '<(DEPTH)/third_party/webrtc/media/base/rtpdataengine.cc',
diff --git a/third_party/libjingle/libjingle_common.gypi b/third_party/libjingle/libjingle_common.gypi
index 9b43115..9930f1e 100644
--- a/third_party/libjingle/libjingle_common.gypi
+++ b/third_party/libjingle/libjingle_common.gypi
@@ -16,11 +16,11 @@
     '<(webrtc_p2p)/base/basicpacketsocketfactory.h',
     '<(webrtc_p2p)/base/candidate.h',
     '<(webrtc_p2p)/base/common.h',
-    '<(webrtc_p2p)/base/constants.cc',
-    '<(webrtc_p2p)/base/constants.h',
     '<(webrtc_p2p)/base/dtlstransport.h',
     '<(webrtc_p2p)/base/dtlstransportchannel.cc',
     '<(webrtc_p2p)/base/dtlstransportchannel.h',
+    '<(webrtc_p2p)/base/p2pconstants.cc',
+    '<(webrtc_p2p)/base/p2pconstants.h',
     '<(webrtc_p2p)/base/p2ptransport.cc',
     '<(webrtc_p2p)/base/p2ptransport.h',
     '<(webrtc_p2p)/base/p2ptransportchannel.cc',
diff --git a/third_party/libjingle/libjingle_nacl.gyp b/third_party/libjingle/libjingle_nacl.gyp
index 9fb677a..81742ba 100644
--- a/third_party/libjingle/libjingle_nacl.gyp
+++ b/third_party/libjingle/libjingle_nacl.gyp
@@ -29,7 +29,6 @@
         '<(DEPTH)/native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untrusted',
         '<(DEPTH)/third_party/expat/expat_nacl.gyp:expat_nacl',
         '<(DEPTH)/third_party/boringssl/boringssl_nacl.gyp:boringssl_nacl',
-        'libjingle_p2p_constants_nacl',
       ],
       'defines': [
         'EXPAT_RELATIVE_PATH',
@@ -253,9 +252,6 @@
         '<(webrtc_system_wrappers)/source/field_trial_default.cc',
       ],
       'sources!': [
-        # Compiled as part of libjingle_p2p_constants_nacl.
-        '<(webrtc_p2p)/base/constants.cc',
-        '<(webrtc_p2p)/base/constants.h',
         # For NACL, we have the field_trial_default and don't need the
         # field_trail.cc.
         'overrides/field_trial.cc',
@@ -295,25 +291,5 @@
         '<(DEPTH)/native_client_sdk/native_client_sdk_untrusted.gyp:nacl_io_untrusted',
       ],
     },  # end of target 'libjingle_nacl'
-
-    {
-      'target_name': 'libjingle_p2p_constants_nacl',
-      'type': 'none',
-      'variables': {
-        'nlib_target': 'libjingle_p2p_constants_nacl.a',
-        'nacl_untrusted_build': 1,
-        'build_glibc': 0,
-        'build_newlib': 1,
-        'build_pnacl_newlib': 1,
-      },
-      'include_dirs': [
-        './<(libjingle_source)',
-        '../'
-      ],
-      'sources': [
-        '<(webrtc_p2p)/base/constants.cc',
-        '<(webrtc_p2p)/base/constants.h',
-      ],
-    },  # end of target 'libjingle_p2p_constants_nacl'
   ],
 }