Bug 1509994 - Update gn generated json files; r=pehrsons
authorDan Minor <dminor@mozilla.com>
Tue, 27 Nov 2018 17:32:52 +0000
changeset 507794 6cea864da2b6ae105a22219cf3e166d9d2b9aa31
parent 507793 0fd399c6caabff60ac0fe53b920b7d26a9806750
child 507795 cab408925a76ee7c005a122850e75b6864b7638a
push id1905
push userffxbld-merge
push dateMon, 21 Jan 2019 12:33:13 +0000
treeherdermozilla-release@c2fca1944d8c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewerspehrsons
bugs1509994
milestone65.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1509994 - Update gn generated json files; r=pehrsons Depends on D13092 Differential Revision: https://phabricator.services.mozilla.com/D13094
media/webrtc/gn-configs/ppc64_False_ppc64_linux.json
media/webrtc/gn-configs/ppc64_True_ppc64_linux.json
media/webrtc/gn-configs/x64_False_arm64_win.json
media/webrtc/gn-configs/x64_False_x64_dragonfly.json
media/webrtc/gn-configs/x64_False_x64_freebsd.json
media/webrtc/gn-configs/x64_False_x64_linux.json
media/webrtc/gn-configs/x64_False_x64_mac.json
media/webrtc/gn-configs/x64_False_x64_netbsd.json
media/webrtc/gn-configs/x64_False_x64_openbsd.json
media/webrtc/gn-configs/x64_False_x64_win.json
media/webrtc/gn-configs/x64_False_x86_linux.json
media/webrtc/gn-configs/x64_True_arm64_win.json
media/webrtc/gn-configs/x64_True_x64_dragonfly.json
media/webrtc/gn-configs/x64_True_x64_freebsd.json
media/webrtc/gn-configs/x64_True_x64_linux.json
media/webrtc/gn-configs/x64_True_x64_mac.json
media/webrtc/gn-configs/x64_True_x64_netbsd.json
media/webrtc/gn-configs/x64_True_x64_openbsd.json
media/webrtc/gn-configs/x64_True_x64_win.json
media/webrtc/gn-configs/x64_True_x86_linux.json
media/webrtc/gn-configs/x86_False_x86_freebsd.json
media/webrtc/gn-configs/x86_False_x86_netbsd.json
media/webrtc/gn-configs/x86_False_x86_openbsd.json
media/webrtc/gn-configs/x86_False_x86_win.json
media/webrtc/gn-configs/x86_True_x86_freebsd.json
media/webrtc/gn-configs/x86_True_x86_netbsd.json
media/webrtc/gn-configs/x86_True_x86_openbsd.json
media/webrtc/gn-configs/x86_True_x86_win.json
--- a/media/webrtc/gn-configs/ppc64_False_ppc64_linux.json
+++ b/media/webrtc/gn-configs/ppc64_False_ppc64_linux.json
@@ -79,17 +79,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/mnt/dan/firefox.git/obj-powerpc64le-unknown-linux-gnu/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -10548,79 +10547,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-fPIC",
-                "-pipe",
-                "-pthread",
-                "-Wall",
-                "-Werror",
-                "-Wno-unused-local-typedefs",
-                "-Wno-maybe-uninitialized",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-O2",
-                "-fno-ident",
-                "-fdata-sections",
-                "-ffunction-sections",
-                "-fomit-frame-pointer",
-                "-g0",
-                "-fvisibility=hidden",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_NSS_CERTS=1",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "NDEBUG",
-                "NVALGRIND",
-                "DYNAMIC_ANNOTATIONS_ENABLED=0",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_LINUX"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/mnt/dan/firefox.git/obj-powerpc64le-unknown-linux-gnu/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -10797,9 +10733,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/ppc64_True_ppc64_linux.json
+++ b/media/webrtc/gn-configs/ppc64_True_ppc64_linux.json
@@ -75,17 +75,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/mnt/dan/firefox.git/obj-powerpc64le-unknown-linux-gnu/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -10008,75 +10007,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-fPIC",
-                "-pipe",
-                "-pthread",
-                "-Wall",
-                "-Werror",
-                "-Wno-unused-local-typedefs",
-                "-Wno-maybe-uninitialized",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-O0",
-                "-fno-omit-frame-pointer",
-                "-g2",
-                "-fvisibility=hidden",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_NSS_CERTS=1",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "DYNAMIC_ANNOTATIONS_ENABLED=1",
-                "WTF_USE_DYNAMIC_ANNOTATIONS=1",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_LINUX"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/mnt/dan/firefox.git/obj-powerpc64le-unknown-linux-gnu/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
--- a/media/webrtc/gn-configs/x64_False_arm64_win.json
+++ b/media/webrtc/gn-configs/x64_False_arm64_win.json
@@ -114,17 +114,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "s:/orange/obj/arm/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -15807,114 +15806,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "/wd4117",
-                "/D__DATE__=",
-                "/D__TIME__=",
-                "/D__TIMESTAMP__=",
-                "/Gy",
-                "/FS",
-                "/bigobj",
-                "/d2FastFail",
-                "/Zc:sizedDealloc-",
-                "/W4",
-                "/WX",
-                "/utf-8",
-                "/wd4091",
-                "/wd4127",
-                "/wd4251",
-                "/wd4312",
-                "/wd4351",
-                "/wd4355",
-                "/wd4503",
-                "/wd4589",
-                "/wd4611",
-                "/wd4100",
-                "/wd4121",
-                "/wd4244",
-                "/wd4505",
-                "/wd4510",
-                "/wd4512",
-                "/wd4610",
-                "/wd4838",
-                "/wd4995",
-                "/wd4996",
-                "/wd4456",
-                "/wd4457",
-                "/wd4458",
-                "/wd4459",
-                "/O1",
-                "/Ob2",
-                "/Oy-",
-                "/d2Zi+",
-                "/Zc:inline",
-                "/Gw",
-                "/Oi",
-                "/Zi",
-                "/MT"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "NO_TCMALLOC",
-                "CHROMIUM_BUILD",
-                "__STD_C",
-                "_CRT_RAND_S",
-                "_CRT_SECURE_NO_DEPRECATE",
-                "_HAS_EXCEPTIONS=0",
-                "_SCL_SECURE_NO_DEPRECATE",
-                "_ATL_NO_OPENGL",
-                "_WINDOWS",
-                "CERT_CHAIN_PARA_HAS_EXTRA_FIELDS",
-                "PSAPI_VERSION=1",
-                "WIN32",
-                "_SECURE_ATL",
-                "_USING_V110_SDK71_",
-                "WIN32_LEAN_AND_MEAN",
-                "NOMINMAX",
-                "_UNICODE",
-                "UNICODE",
-                "NTDDI_VERSION=0x0A000000",
-                "_WIN32_WINNT=0x0A00",
-                "WINVER=0x0A00",
-                "NDEBUG",
-                "NVALGRIND",
-                "DYNAMIC_ANNOTATIONS_ENABLED=0",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_ARCH_ARM64",
-                "WEBRTC_HAS_NEON",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_WIN",
-                "_CRT_SECURE_NO_WARNINGS"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "s:/orange/obj/arm/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "/wd4117",
                 "/D__DATE__=",
                 "/D__TIME__=",
                 "/D__TIMESTAMP__=",
                 "/Gy",
                 "/FS",
@@ -16162,9 +16063,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/x64_False_x64_dragonfly.json
+++ b/media/webrtc/gn-configs/x64_False_x64_dragonfly.json
@@ -78,17 +78,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -10440,78 +10439,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-m64",
-                "-march=x86-64",
-                "-Wall",
-                "-Werror",
-                "-Wno-unused-local-typedefs",
-                "-Wno-maybe-uninitialized",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-O2",
-                "-fno-ident",
-                "-fdata-sections",
-                "-ffunction-sections",
-                "-fomit-frame-pointer",
-                "-g2",
-                "-fvisibility=hidden",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "_FORTIFY_SOURCE=2",
-                "NDEBUG",
-                "NVALGRIND",
-                "DYNAMIC_ANNOTATIONS_ENABLED=0",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_BSD"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -10681,9 +10618,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/x64_False_x64_freebsd.json
+++ b/media/webrtc/gn-configs/x64_False_x64_freebsd.json
@@ -104,17 +104,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -13752,104 +13751,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-fcolor-diagnostics",
-                "-m64",
-                "-march=x86-64",
-                "-Wall",
-                "-Werror",
-                "-Wextra",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-Wno-c++11-narrowing",
-                "-Wno-covered-switch-default",
-                "-Wno-unneeded-internal-declaration",
-                "-Wno-inconsistent-missing-override",
-                "-Wno-undefined-var-template",
-                "-Wno-nonportable-include-path",
-                "-Wno-address-of-packed-member",
-                "-Wno-unused-lambda-capture",
-                "-Wno-user-defined-warnings",
-                "-O2",
-                "-fno-ident",
-                "-fdata-sections",
-                "-ffunction-sections",
-                "-fomit-frame-pointer",
-                "-g2",
-                "-fvisibility=hidden",
-                "-Xclang",
-                "-add-plugin",
-                "-Xclang",
-                "find-bad-constructs",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-auto-raw-pointer",
-                "-Wheader-hygiene",
-                "-Wstring-conversion",
-                "-Wtautological-overlap-compare",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow",
-                "-Wc++11-narrowing",
-                "-Wimplicit-fallthrough",
-                "-Wthread-safety",
-                "-Winconsistent-missing-override",
-                "-Wundef",
-                "-Wunused-lambda-capture"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "_FORTIFY_SOURCE=2",
-                "NDEBUG",
-                "NVALGRIND",
-                "DYNAMIC_ANNOTATIONS_ENABLED=0",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_BSD"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -14063,9 +13974,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/x64_False_x64_linux.json
+++ b/media/webrtc/gn-configs/x64_False_x64_linux.json
@@ -116,17 +116,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/home/dminor/src/firefox-branchupdate/objdir-ff-asan/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -15414,116 +15413,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-fPIC",
-                "-pipe",
-                "-B../../../../../../media/webrtc/trunk/webrtc/third_party/binutils/Linux_x64/Release/bin",
-                "-fcolor-diagnostics",
-                "-m64",
-                "-march=x86-64",
-                "-pthread",
-                "-Wall",
-                "-Werror",
-                "-Wextra",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-Wno-c++11-narrowing",
-                "-Wno-covered-switch-default",
-                "-Wno-unneeded-internal-declaration",
-                "-Wno-inconsistent-missing-override",
-                "-Wno-undefined-var-template",
-                "-Wno-nonportable-include-path",
-                "-Wno-address-of-packed-member",
-                "-Wno-unused-lambda-capture",
-                "-Wno-user-defined-warnings",
-                "-O2",
-                "-fno-ident",
-                "-fdata-sections",
-                "-ffunction-sections",
-                "-fomit-frame-pointer",
-                "-g0",
-                "-fvisibility=hidden",
-                "-Xclang",
-                "-load",
-                "-Xclang",
-                "../../../../../../media/webrtc/trunk/webrtc/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so",
-                "-Xclang",
-                "-add-plugin",
-                "-Xclang",
-                "find-bad-constructs",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-auto-raw-pointer",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-ipc",
-                "-Wheader-hygiene",
-                "-Wstring-conversion",
-                "-Wtautological-overlap-compare",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow",
-                "-Wc++11-narrowing",
-                "-Wimplicit-fallthrough",
-                "-Wthread-safety",
-                "-Winconsistent-missing-override",
-                "-Wundef",
-                "-Wunused-lambda-capture"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_NSS_CERTS=1",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "NDEBUG",
-                "NVALGRIND",
-                "DYNAMIC_ANNOTATIONS_ENABLED=0",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_LINUX"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/home/dminor/src/firefox-branchupdate/objdir-ff-asan/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
--- a/media/webrtc/gn-configs/x64_False_x64_mac.json
+++ b/media/webrtc/gn-configs/x64_False_x64_mac.json
@@ -108,17 +108,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/Users/dminor/src/firefox/obj-x86_64-apple-darwin17.7.0/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -14749,108 +14748,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-fcolor-diagnostics",
-                "-arch",
-                "x86_64",
-                "-Wall",
-                "-Werror",
-                "-Wextra",
-                "-Wpartial-availability",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-Wno-c++11-narrowing",
-                "-Wno-covered-switch-default",
-                "-Wno-unneeded-internal-declaration",
-                "-Wno-inconsistent-missing-override",
-                "-Wno-undefined-var-template",
-                "-Wno-nonportable-include-path",
-                "-Wno-address-of-packed-member",
-                "-Wno-unused-lambda-capture",
-                "-Wno-user-defined-warnings",
-                "-O2",
-                "-fno-omit-frame-pointer",
-                "-gdwarf-2",
-                "-isysroot",
-                "../../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
-                "-mmacosx-version-min=10.9",
-                "-fvisibility=hidden",
-                "-Xclang",
-                "-load",
-                "-Xclang",
-                "../../../../../../media/webrtc/trunk/webrtc/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
-                "-Xclang",
-                "-add-plugin",
-                "-Xclang",
-                "find-bad-constructs",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-auto-raw-pointer",
-                "-Wheader-hygiene",
-                "-Wstring-conversion",
-                "-Wtautological-overlap-compare",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow",
-                "-Wc++11-narrowing",
-                "-Wimplicit-fallthrough",
-                "-Wthread-safety",
-                "-Winconsistent-missing-override",
-                "-Wundef",
-                "-Wunused-lambda-capture"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "NO_TCMALLOC",
-                "CHROMIUM_BUILD",
-                "CR_XCODE_VERSION=0920",
-                "_FORTIFY_SOURCE=2",
-                "__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE=0",
-                "NDEBUG",
-                "NVALGRIND",
-                "DYNAMIC_ANNOTATIONS_ENABLED=0",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_MAC"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin17.7.0/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
                 "-D__TIMESTAMP__=",
--- a/media/webrtc/gn-configs/x64_False_x64_netbsd.json
+++ b/media/webrtc/gn-configs/x64_False_x64_netbsd.json
@@ -78,17 +78,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -10440,78 +10439,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-m64",
-                "-march=x86-64",
-                "-Wall",
-                "-Werror",
-                "-Wno-unused-local-typedefs",
-                "-Wno-maybe-uninitialized",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-O2",
-                "-fno-ident",
-                "-fdata-sections",
-                "-ffunction-sections",
-                "-fomit-frame-pointer",
-                "-g2",
-                "-fvisibility=hidden",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "_FORTIFY_SOURCE=2",
-                "NDEBUG",
-                "NVALGRIND",
-                "DYNAMIC_ANNOTATIONS_ENABLED=0",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_BSD"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -10681,9 +10618,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/x64_False_x64_openbsd.json
+++ b/media/webrtc/gn-configs/x64_False_x64_openbsd.json
@@ -104,17 +104,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -13752,104 +13751,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-fcolor-diagnostics",
-                "-m64",
-                "-march=x86-64",
-                "-Wall",
-                "-Werror",
-                "-Wextra",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-Wno-c++11-narrowing",
-                "-Wno-covered-switch-default",
-                "-Wno-unneeded-internal-declaration",
-                "-Wno-inconsistent-missing-override",
-                "-Wno-undefined-var-template",
-                "-Wno-nonportable-include-path",
-                "-Wno-address-of-packed-member",
-                "-Wno-unused-lambda-capture",
-                "-Wno-user-defined-warnings",
-                "-O2",
-                "-fno-ident",
-                "-fdata-sections",
-                "-ffunction-sections",
-                "-fomit-frame-pointer",
-                "-g2",
-                "-fvisibility=hidden",
-                "-Xclang",
-                "-add-plugin",
-                "-Xclang",
-                "find-bad-constructs",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-auto-raw-pointer",
-                "-Wheader-hygiene",
-                "-Wstring-conversion",
-                "-Wtautological-overlap-compare",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow",
-                "-Wc++11-narrowing",
-                "-Wimplicit-fallthrough",
-                "-Wthread-safety",
-                "-Winconsistent-missing-override",
-                "-Wundef",
-                "-Wunused-lambda-capture"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "_FORTIFY_SOURCE=2",
-                "NDEBUG",
-                "NVALGRIND",
-                "DYNAMIC_ANNOTATIONS_ENABLED=0",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_BSD"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -14063,9 +13974,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/x64_False_x64_win.json
+++ b/media/webrtc/gn-configs/x64_False_x64_win.json
@@ -112,17 +112,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "c:/src/firefox/obj-i686-pc-mingw32/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -15323,112 +15322,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "/wd4117",
-                "/D__DATE__=",
-                "/D__TIME__=",
-                "/D__TIMESTAMP__=",
-                "/Gy",
-                "/FS",
-                "/bigobj",
-                "/d2FastFail",
-                "/Zc:sizedDealloc-",
-                "/W4",
-                "/WX",
-                "/utf-8",
-                "/wd4091",
-                "/wd4127",
-                "/wd4251",
-                "/wd4312",
-                "/wd4351",
-                "/wd4355",
-                "/wd4503",
-                "/wd4589",
-                "/wd4611",
-                "/wd4100",
-                "/wd4121",
-                "/wd4244",
-                "/wd4505",
-                "/wd4510",
-                "/wd4512",
-                "/wd4610",
-                "/wd4838",
-                "/wd4995",
-                "/wd4996",
-                "/wd4456",
-                "/wd4457",
-                "/wd4458",
-                "/wd4459",
-                "/O1",
-                "/Ob2",
-                "/Oy-",
-                "/d2Zi+",
-                "/Zc:inline",
-                "/Gw",
-                "/Oi",
-                "/Zi",
-                "/MT"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "NO_TCMALLOC",
-                "CHROMIUM_BUILD",
-                "__STD_C",
-                "_CRT_RAND_S",
-                "_CRT_SECURE_NO_DEPRECATE",
-                "_HAS_EXCEPTIONS=0",
-                "_SCL_SECURE_NO_DEPRECATE",
-                "_ATL_NO_OPENGL",
-                "_WINDOWS",
-                "CERT_CHAIN_PARA_HAS_EXTRA_FIELDS",
-                "PSAPI_VERSION=1",
-                "WIN32",
-                "_SECURE_ATL",
-                "_USING_V110_SDK71_",
-                "WIN32_LEAN_AND_MEAN",
-                "NOMINMAX",
-                "_UNICODE",
-                "UNICODE",
-                "NTDDI_VERSION=0x0A000000",
-                "_WIN32_WINNT=0x0A00",
-                "WINVER=0x0A00",
-                "NDEBUG",
-                "NVALGRIND",
-                "DYNAMIC_ANNOTATIONS_ENABLED=0",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_WIN",
-                "_CRT_SECURE_NO_WARNINGS"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "c:/src/firefox/obj-i686-pc-mingw32/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "/wd4117",
                 "/D__DATE__=",
                 "/D__TIME__=",
                 "/D__TIMESTAMP__=",
                 "/Gy",
                 "/FS",
@@ -15672,9 +15575,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/x64_False_x86_linux.json
+++ b/media/webrtc/gn-configs/x64_False_x86_linux.json
@@ -122,17 +122,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/home/cmanchester/m-c/obj-dbg/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -16244,122 +16243,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-fPIC",
-                "-pipe",
-                "-B../../../../../../media/webrtc/trunk/webrtc/third_party/binutils/Linux_x64/Release/bin",
-                "-fcolor-diagnostics",
-                "-m32",
-                "-msse2",
-                "-mfpmath=sse",
-                "-mmmx",
-                "-momit-leaf-frame-pointer",
-                "-pthread",
-                "-mstack-alignment=16",
-                "-mstackrealign",
-                "-Wall",
-                "-Werror",
-                "-Wextra",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-Wno-c++11-narrowing",
-                "-Wno-covered-switch-default",
-                "-Wno-unneeded-internal-declaration",
-                "-Wno-inconsistent-missing-override",
-                "-Wno-deprecated-register",
-                "-Wno-undefined-var-template",
-                "-Wno-nonportable-include-path",
-                "-Wno-address-of-packed-member",
-                "-Wno-unused-lambda-capture",
-                "-Wno-user-defined-warnings",
-                "-O2",
-                "-fno-ident",
-                "-fdata-sections",
-                "-ffunction-sections",
-                "-fomit-frame-pointer",
-                "-g0",
-                "-fvisibility=hidden",
-                "-Xclang",
-                "-load",
-                "-Xclang",
-                "../../../../../../media/webrtc/trunk/webrtc/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so",
-                "-Xclang",
-                "-add-plugin",
-                "-Xclang",
-                "find-bad-constructs",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-auto-raw-pointer",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-ipc",
-                "-Wheader-hygiene",
-                "-Wstring-conversion",
-                "-Wtautological-overlap-compare",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow",
-                "-Wc++11-narrowing",
-                "-Wimplicit-fallthrough",
-                "-Wthread-safety",
-                "-Winconsistent-missing-override",
-                "-Wundef",
-                "-Wunused-lambda-capture"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_NSS_CERTS=1",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "NDEBUG",
-                "NVALGRIND",
-                "DYNAMIC_ANNOTATIONS_ENABLED=0",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_LINUX"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/home/cmanchester/m-c/obj-dbg/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
--- a/media/webrtc/gn-configs/x64_True_arm64_win.json
+++ b/media/webrtc/gn-configs/x64_True_arm64_win.json
@@ -109,17 +109,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "s:/orange/obj/armdebug/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -15107,109 +15106,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "/wd4117",
-                "/D__DATE__=",
-                "/D__TIME__=",
-                "/D__TIMESTAMP__=",
-                "/Gy",
-                "/FS",
-                "/bigobj",
-                "/d2FastFail",
-                "/Zc:sizedDealloc-",
-                "/W4",
-                "/WX",
-                "/utf-8",
-                "/wd4091",
-                "/wd4127",
-                "/wd4251",
-                "/wd4312",
-                "/wd4351",
-                "/wd4355",
-                "/wd4503",
-                "/wd4589",
-                "/wd4611",
-                "/wd4100",
-                "/wd4121",
-                "/wd4244",
-                "/wd4505",
-                "/wd4510",
-                "/wd4512",
-                "/wd4610",
-                "/wd4838",
-                "/wd4995",
-                "/wd4996",
-                "/wd4456",
-                "/wd4457",
-                "/wd4458",
-                "/wd4459",
-                "/Od",
-                "/Ob0",
-                "/GF",
-                "/Zi",
-                "/MTd"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "NO_TCMALLOC",
-                "CHROMIUM_BUILD",
-                "__STD_C",
-                "_CRT_RAND_S",
-                "_CRT_SECURE_NO_DEPRECATE",
-                "_HAS_EXCEPTIONS=0",
-                "_SCL_SECURE_NO_DEPRECATE",
-                "_ATL_NO_OPENGL",
-                "_WINDOWS",
-                "CERT_CHAIN_PARA_HAS_EXTRA_FIELDS",
-                "PSAPI_VERSION=1",
-                "WIN32",
-                "_SECURE_ATL",
-                "_USING_V110_SDK71_",
-                "WIN32_LEAN_AND_MEAN",
-                "NOMINMAX",
-                "_UNICODE",
-                "UNICODE",
-                "NTDDI_VERSION=0x0A000000",
-                "_WIN32_WINNT=0x0A00",
-                "WINVER=0x0A00",
-                "DYNAMIC_ANNOTATIONS_ENABLED=1",
-                "WTF_USE_DYNAMIC_ANNOTATIONS=1",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_ARCH_ARM64",
-                "WEBRTC_HAS_NEON",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_WIN",
-                "_CRT_SECURE_NO_WARNINGS"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "s:/orange/obj/armdebug/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "/wd4117",
                 "/D__DATE__=",
                 "/D__TIME__=",
                 "/D__TIMESTAMP__=",
                 "/Gy",
                 "/FS",
@@ -15447,9 +15353,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/x64_True_x64_dragonfly.json
+++ b/media/webrtc/gn-configs/x64_True_x64_dragonfly.json
@@ -73,17 +73,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -9750,73 +9749,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-m64",
-                "-march=x86-64",
-                "-Wall",
-                "-Werror",
-                "-Wno-unused-local-typedefs",
-                "-Wno-maybe-uninitialized",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-O0",
-                "-fno-omit-frame-pointer",
-                "-g2",
-                "-fvisibility=hidden",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "DYNAMIC_ANNOTATIONS_ENABLED=1",
-                "WTF_USE_DYNAMIC_ANNOTATIONS=1",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_BSD"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -9976,9 +9918,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/x64_True_x64_freebsd.json
+++ b/media/webrtc/gn-configs/x64_True_x64_freebsd.json
@@ -99,17 +99,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -13062,99 +13061,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-fcolor-diagnostics",
-                "-m64",
-                "-march=x86-64",
-                "-Wall",
-                "-Werror",
-                "-Wextra",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-Wno-c++11-narrowing",
-                "-Wno-covered-switch-default",
-                "-Wno-unneeded-internal-declaration",
-                "-Wno-inconsistent-missing-override",
-                "-Wno-undefined-var-template",
-                "-Wno-nonportable-include-path",
-                "-Wno-address-of-packed-member",
-                "-Wno-unused-lambda-capture",
-                "-Wno-user-defined-warnings",
-                "-O0",
-                "-fno-omit-frame-pointer",
-                "-g2",
-                "-fvisibility=hidden",
-                "-Xclang",
-                "-add-plugin",
-                "-Xclang",
-                "find-bad-constructs",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-auto-raw-pointer",
-                "-Wheader-hygiene",
-                "-Wstring-conversion",
-                "-Wtautological-overlap-compare",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow",
-                "-Wc++11-narrowing",
-                "-Wimplicit-fallthrough",
-                "-Wthread-safety",
-                "-Winconsistent-missing-override",
-                "-Wundef",
-                "-Wunused-lambda-capture"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "DYNAMIC_ANNOTATIONS_ENABLED=1",
-                "WTF_USE_DYNAMIC_ANNOTATIONS=1",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_BSD"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -13358,9 +13274,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/x64_True_x64_linux.json
+++ b/media/webrtc/gn-configs/x64_True_x64_linux.json
@@ -113,17 +113,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/home/dminor/src/firefox-branchupdate/objdir-ff-asan/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -14997,113 +14996,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-fPIC",
-                "-pipe",
-                "-B../../../../../../media/webrtc/trunk/webrtc/third_party/binutils/Linux_x64/Release/bin",
-                "-fcolor-diagnostics",
-                "-m64",
-                "-march=x86-64",
-                "-pthread",
-                "-Wall",
-                "-Werror",
-                "-Wextra",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-Wno-c++11-narrowing",
-                "-Wno-covered-switch-default",
-                "-Wno-unneeded-internal-declaration",
-                "-Wno-inconsistent-missing-override",
-                "-Wno-undefined-var-template",
-                "-Wno-nonportable-include-path",
-                "-Wno-address-of-packed-member",
-                "-Wno-unused-lambda-capture",
-                "-Wno-user-defined-warnings",
-                "-O0",
-                "-fno-omit-frame-pointer",
-                "-g2",
-                "-gsplit-dwarf",
-                "-fvisibility=hidden",
-                "-Xclang",
-                "-load",
-                "-Xclang",
-                "../../../../../../media/webrtc/trunk/webrtc/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so",
-                "-Xclang",
-                "-add-plugin",
-                "-Xclang",
-                "find-bad-constructs",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-auto-raw-pointer",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-ipc",
-                "-Wheader-hygiene",
-                "-Wstring-conversion",
-                "-Wtautological-overlap-compare",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow",
-                "-Wc++11-narrowing",
-                "-Wimplicit-fallthrough",
-                "-Wthread-safety",
-                "-Winconsistent-missing-override",
-                "-Wundef",
-                "-Wunused-lambda-capture"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_NSS_CERTS=1",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "DYNAMIC_ANNOTATIONS_ENABLED=1",
-                "WTF_USE_DYNAMIC_ANNOTATIONS=1",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_LINUX"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/home/dminor/src/firefox-branchupdate/objdir-ff-asan/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
--- a/media/webrtc/gn-configs/x64_True_x64_mac.json
+++ b/media/webrtc/gn-configs/x64_True_x64_mac.json
@@ -106,17 +106,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/Users/dminor/src/firefox/obj-x86_64-apple-darwin17.7.0/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -14465,106 +14464,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "-fstack-protector-strong",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-fcolor-diagnostics",
-                "-arch",
-                "x86_64",
-                "-Wall",
-                "-Werror",
-                "-Wextra",
-                "-Wpartial-availability",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-Wno-c++11-narrowing",
-                "-Wno-covered-switch-default",
-                "-Wno-unneeded-internal-declaration",
-                "-Wno-inconsistent-missing-override",
-                "-Wno-undefined-var-template",
-                "-Wno-nonportable-include-path",
-                "-Wno-address-of-packed-member",
-                "-Wno-unused-lambda-capture",
-                "-Wno-user-defined-warnings",
-                "-O0",
-                "-fno-omit-frame-pointer",
-                "-gdwarf-2",
-                "-isysroot",
-                "../../../../../../../../../../Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk",
-                "-mmacosx-version-min=10.9",
-                "-fvisibility=hidden",
-                "-Xclang",
-                "-load",
-                "-Xclang",
-                "../../../../../../media/webrtc/trunk/webrtc/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.dylib",
-                "-Xclang",
-                "-add-plugin",
-                "-Xclang",
-                "find-bad-constructs",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-auto-raw-pointer",
-                "-Wheader-hygiene",
-                "-Wstring-conversion",
-                "-Wtautological-overlap-compare",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow",
-                "-Wc++11-narrowing",
-                "-Wimplicit-fallthrough",
-                "-Wthread-safety",
-                "-Winconsistent-missing-override",
-                "-Wundef",
-                "-Wunused-lambda-capture"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "NO_TCMALLOC",
-                "CHROMIUM_BUILD",
-                "CR_XCODE_VERSION=0920",
-                "__ASSERT_MACROS_DEFINE_VERSIONS_WITHOUT_UNDERSCORE=0",
-                "DYNAMIC_ANNOTATIONS_ENABLED=1",
-                "WTF_USE_DYNAMIC_ANNOTATIONS=1",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_MAC"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/Users/dminor/src/firefox/obj-x86_64-apple-darwin17.7.0/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "-fstack-protector-strong",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
                 "-D__TIMESTAMP__=",
--- a/media/webrtc/gn-configs/x64_True_x64_netbsd.json
+++ b/media/webrtc/gn-configs/x64_True_x64_netbsd.json
@@ -73,17 +73,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -9750,73 +9749,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-m64",
-                "-march=x86-64",
-                "-Wall",
-                "-Werror",
-                "-Wno-unused-local-typedefs",
-                "-Wno-maybe-uninitialized",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-O0",
-                "-fno-omit-frame-pointer",
-                "-g2",
-                "-fvisibility=hidden",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "DYNAMIC_ANNOTATIONS_ENABLED=1",
-                "WTF_USE_DYNAMIC_ANNOTATIONS=1",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_BSD"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -9976,9 +9918,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/x64_True_x64_openbsd.json
+++ b/media/webrtc/gn-configs/x64_True_x64_openbsd.json
@@ -99,17 +99,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -13062,99 +13061,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-fcolor-diagnostics",
-                "-m64",
-                "-march=x86-64",
-                "-Wall",
-                "-Werror",
-                "-Wextra",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-Wno-c++11-narrowing",
-                "-Wno-covered-switch-default",
-                "-Wno-unneeded-internal-declaration",
-                "-Wno-inconsistent-missing-override",
-                "-Wno-undefined-var-template",
-                "-Wno-nonportable-include-path",
-                "-Wno-address-of-packed-member",
-                "-Wno-unused-lambda-capture",
-                "-Wno-user-defined-warnings",
-                "-O0",
-                "-fno-omit-frame-pointer",
-                "-g2",
-                "-fvisibility=hidden",
-                "-Xclang",
-                "-add-plugin",
-                "-Xclang",
-                "find-bad-constructs",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-auto-raw-pointer",
-                "-Wheader-hygiene",
-                "-Wstring-conversion",
-                "-Wtautological-overlap-compare",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow",
-                "-Wc++11-narrowing",
-                "-Wimplicit-fallthrough",
-                "-Wthread-safety",
-                "-Winconsistent-missing-override",
-                "-Wundef",
-                "-Wunused-lambda-capture"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "DYNAMIC_ANNOTATIONS_ENABLED=1",
-                "WTF_USE_DYNAMIC_ANNOTATIONS=1",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_BSD"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -13358,9 +13274,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/x64_True_x64_win.json
+++ b/media/webrtc/gn-configs/x64_True_x64_win.json
@@ -107,17 +107,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "c:/src/firefox/obj-i686-pc-mingw32/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -14633,107 +14632,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "/wd4117",
-                "/D__DATE__=",
-                "/D__TIME__=",
-                "/D__TIMESTAMP__=",
-                "/Gy",
-                "/FS",
-                "/bigobj",
-                "/d2FastFail",
-                "/Zc:sizedDealloc-",
-                "/W4",
-                "/WX",
-                "/utf-8",
-                "/wd4091",
-                "/wd4127",
-                "/wd4251",
-                "/wd4312",
-                "/wd4351",
-                "/wd4355",
-                "/wd4503",
-                "/wd4589",
-                "/wd4611",
-                "/wd4100",
-                "/wd4121",
-                "/wd4244",
-                "/wd4505",
-                "/wd4510",
-                "/wd4512",
-                "/wd4610",
-                "/wd4838",
-                "/wd4995",
-                "/wd4996",
-                "/wd4456",
-                "/wd4457",
-                "/wd4458",
-                "/wd4459",
-                "/Od",
-                "/Ob0",
-                "/GF",
-                "/Zi",
-                "/MTd"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "NO_TCMALLOC",
-                "CHROMIUM_BUILD",
-                "__STD_C",
-                "_CRT_RAND_S",
-                "_CRT_SECURE_NO_DEPRECATE",
-                "_HAS_EXCEPTIONS=0",
-                "_SCL_SECURE_NO_DEPRECATE",
-                "_ATL_NO_OPENGL",
-                "_WINDOWS",
-                "CERT_CHAIN_PARA_HAS_EXTRA_FIELDS",
-                "PSAPI_VERSION=1",
-                "WIN32",
-                "_SECURE_ATL",
-                "_USING_V110_SDK71_",
-                "WIN32_LEAN_AND_MEAN",
-                "NOMINMAX",
-                "_UNICODE",
-                "UNICODE",
-                "NTDDI_VERSION=0x0A000000",
-                "_WIN32_WINNT=0x0A00",
-                "WINVER=0x0A00",
-                "DYNAMIC_ANNOTATIONS_ENABLED=1",
-                "WTF_USE_DYNAMIC_ANNOTATIONS=1",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_WIN",
-                "_CRT_SECURE_NO_WARNINGS"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "c:/src/firefox/obj-i686-pc-mingw32/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "/wd4117",
                 "/D__DATE__=",
                 "/D__TIME__=",
                 "/D__TIMESTAMP__=",
                 "/Gy",
                 "/FS",
@@ -14967,9 +14875,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/x64_True_x86_linux.json
+++ b/media/webrtc/gn-configs/x64_True_x86_linux.json
@@ -119,17 +119,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/home/cmanchester/m-c/obj-dbg/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -15827,119 +15826,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-fPIC",
-                "-pipe",
-                "-B../../../../../../media/webrtc/trunk/webrtc/third_party/binutils/Linux_x64/Release/bin",
-                "-fcolor-diagnostics",
-                "-m32",
-                "-msse2",
-                "-mfpmath=sse",
-                "-mmmx",
-                "-momit-leaf-frame-pointer",
-                "-pthread",
-                "-mstack-alignment=16",
-                "-mstackrealign",
-                "-Wall",
-                "-Werror",
-                "-Wextra",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-Wno-c++11-narrowing",
-                "-Wno-covered-switch-default",
-                "-Wno-unneeded-internal-declaration",
-                "-Wno-inconsistent-missing-override",
-                "-Wno-deprecated-register",
-                "-Wno-undefined-var-template",
-                "-Wno-nonportable-include-path",
-                "-Wno-address-of-packed-member",
-                "-Wno-unused-lambda-capture",
-                "-Wno-user-defined-warnings",
-                "-O0",
-                "-fno-omit-frame-pointer",
-                "-g2",
-                "-gsplit-dwarf",
-                "-fvisibility=hidden",
-                "-Xclang",
-                "-load",
-                "-Xclang",
-                "../../../../../../media/webrtc/trunk/webrtc/third_party/llvm-build/Release+Asserts/lib/libFindBadConstructs.so",
-                "-Xclang",
-                "-add-plugin",
-                "-Xclang",
-                "find-bad-constructs",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-auto-raw-pointer",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-ipc",
-                "-Wheader-hygiene",
-                "-Wstring-conversion",
-                "-Wtautological-overlap-compare",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow",
-                "-Wc++11-narrowing",
-                "-Wimplicit-fallthrough",
-                "-Wthread-safety",
-                "-Winconsistent-missing-override",
-                "-Wundef",
-                "-Wunused-lambda-capture"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_NSS_CERTS=1",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "DYNAMIC_ANNOTATIONS_ENABLED=1",
-                "WTF_USE_DYNAMIC_ANNOTATIONS=1",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_LINUX"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/home/cmanchester/m-c/obj-dbg/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
--- a/media/webrtc/gn-configs/x86_False_x86_freebsd.json
+++ b/media/webrtc/gn-configs/x86_False_x86_freebsd.json
@@ -107,17 +107,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -14166,107 +14165,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-fcolor-diagnostics",
-                "-m32",
-                "-msse2",
-                "-mfpmath=sse",
-                "-mmmx",
-                "-momit-leaf-frame-pointer",
-                "-Wall",
-                "-Werror",
-                "-Wextra",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-Wno-c++11-narrowing",
-                "-Wno-covered-switch-default",
-                "-Wno-unneeded-internal-declaration",
-                "-Wno-inconsistent-missing-override",
-                "-Wno-undefined-var-template",
-                "-Wno-nonportable-include-path",
-                "-Wno-address-of-packed-member",
-                "-Wno-unused-lambda-capture",
-                "-Wno-user-defined-warnings",
-                "-O2",
-                "-fno-ident",
-                "-fdata-sections",
-                "-ffunction-sections",
-                "-fomit-frame-pointer",
-                "-g2",
-                "-fvisibility=hidden",
-                "-Xclang",
-                "-add-plugin",
-                "-Xclang",
-                "find-bad-constructs",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-auto-raw-pointer",
-                "-Wheader-hygiene",
-                "-Wstring-conversion",
-                "-Wtautological-overlap-compare",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow",
-                "-Wc++11-narrowing",
-                "-Wimplicit-fallthrough",
-                "-Wthread-safety",
-                "-Winconsistent-missing-override",
-                "-Wundef",
-                "-Wunused-lambda-capture"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "_FORTIFY_SOURCE=2",
-                "NDEBUG",
-                "NVALGRIND",
-                "DYNAMIC_ANNOTATIONS_ENABLED=0",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_BSD"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -14486,9 +14394,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/x86_False_x86_netbsd.json
+++ b/media/webrtc/gn-configs/x86_False_x86_netbsd.json
@@ -80,17 +80,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -10716,80 +10715,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-m32",
-                "-msse2",
-                "-mfpmath=sse",
-                "-mmmx",
-                "-Wall",
-                "-Werror",
-                "-Wno-unused-local-typedefs",
-                "-Wno-maybe-uninitialized",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-O2",
-                "-fno-ident",
-                "-fdata-sections",
-                "-ffunction-sections",
-                "-fomit-frame-pointer",
-                "-g2",
-                "-fvisibility=hidden",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "_FORTIFY_SOURCE=2",
-                "NDEBUG",
-                "NVALGRIND",
-                "DYNAMIC_ANNOTATIONS_ENABLED=0",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_BSD"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -10963,9 +10898,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/x86_False_x86_openbsd.json
+++ b/media/webrtc/gn-configs/x86_False_x86_openbsd.json
@@ -107,17 +107,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -14166,107 +14165,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-fcolor-diagnostics",
-                "-m32",
-                "-msse2",
-                "-mfpmath=sse",
-                "-mmmx",
-                "-momit-leaf-frame-pointer",
-                "-Wall",
-                "-Werror",
-                "-Wextra",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-Wno-c++11-narrowing",
-                "-Wno-covered-switch-default",
-                "-Wno-unneeded-internal-declaration",
-                "-Wno-inconsistent-missing-override",
-                "-Wno-undefined-var-template",
-                "-Wno-nonportable-include-path",
-                "-Wno-address-of-packed-member",
-                "-Wno-unused-lambda-capture",
-                "-Wno-user-defined-warnings",
-                "-O2",
-                "-fno-ident",
-                "-fdata-sections",
-                "-ffunction-sections",
-                "-fomit-frame-pointer",
-                "-g2",
-                "-fvisibility=hidden",
-                "-Xclang",
-                "-add-plugin",
-                "-Xclang",
-                "find-bad-constructs",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-auto-raw-pointer",
-                "-Wheader-hygiene",
-                "-Wstring-conversion",
-                "-Wtautological-overlap-compare",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow",
-                "-Wc++11-narrowing",
-                "-Wimplicit-fallthrough",
-                "-Wthread-safety",
-                "-Winconsistent-missing-override",
-                "-Wundef",
-                "-Wunused-lambda-capture"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "_FORTIFY_SOURCE=2",
-                "NDEBUG",
-                "NVALGRIND",
-                "DYNAMIC_ANNOTATIONS_ENABLED=0",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_BSD"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -14486,9 +14394,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/x86_False_x86_win.json
+++ b/media/webrtc/gn-configs/x86_False_x86_win.json
@@ -113,17 +113,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "c:/src/firefox/obj-i686-pc-mingw32/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -15453,113 +15452,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "/wd4117",
-                "/D__DATE__=",
-                "/D__TIME__=",
-                "/D__TIMESTAMP__=",
-                "/Gy",
-                "/FS",
-                "/bigobj",
-                "/d2FastFail",
-                "/Zc:sizedDealloc-",
-                "/W4",
-                "/WX",
-                "/utf-8",
-                "/wd4091",
-                "/wd4127",
-                "/wd4251",
-                "/wd4312",
-                "/wd4351",
-                "/wd4355",
-                "/wd4503",
-                "/wd4589",
-                "/wd4611",
-                "/wd4100",
-                "/wd4121",
-                "/wd4244",
-                "/wd4505",
-                "/wd4510",
-                "/wd4512",
-                "/wd4610",
-                "/wd4838",
-                "/wd4995",
-                "/wd4996",
-                "/wd4456",
-                "/wd4457",
-                "/wd4458",
-                "/wd4459",
-                "/wd4267",
-                "/O1",
-                "/Ob2",
-                "/Oy-",
-                "/d2Zi+",
-                "/Zc:inline",
-                "/Gw",
-                "/Oi",
-                "/Zi",
-                "/MT"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "NO_TCMALLOC",
-                "CHROMIUM_BUILD",
-                "__STD_C",
-                "_CRT_RAND_S",
-                "_CRT_SECURE_NO_DEPRECATE",
-                "_HAS_EXCEPTIONS=0",
-                "_SCL_SECURE_NO_DEPRECATE",
-                "_ATL_NO_OPENGL",
-                "_WINDOWS",
-                "CERT_CHAIN_PARA_HAS_EXTRA_FIELDS",
-                "PSAPI_VERSION=1",
-                "WIN32",
-                "_SECURE_ATL",
-                "_USING_V110_SDK71_",
-                "WIN32_LEAN_AND_MEAN",
-                "NOMINMAX",
-                "_UNICODE",
-                "UNICODE",
-                "NTDDI_VERSION=0x0A000000",
-                "_WIN32_WINNT=0x0A00",
-                "WINVER=0x0A00",
-                "NDEBUG",
-                "NVALGRIND",
-                "DYNAMIC_ANNOTATIONS_ENABLED=0",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_WIN",
-                "_CRT_SECURE_NO_WARNINGS"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "c:/src/firefox/obj-i686-pc-mingw32/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "/wd4117",
                 "/D__DATE__=",
                 "/D__TIME__=",
                 "/D__TIMESTAMP__=",
                 "/Gy",
                 "/FS",
--- a/media/webrtc/gn-configs/x86_True_x86_freebsd.json
+++ b/media/webrtc/gn-configs/x86_True_x86_freebsd.json
@@ -102,17 +102,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -13476,102 +13475,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-fcolor-diagnostics",
-                "-m32",
-                "-msse2",
-                "-mfpmath=sse",
-                "-mmmx",
-                "-momit-leaf-frame-pointer",
-                "-Wall",
-                "-Werror",
-                "-Wextra",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-Wno-c++11-narrowing",
-                "-Wno-covered-switch-default",
-                "-Wno-unneeded-internal-declaration",
-                "-Wno-inconsistent-missing-override",
-                "-Wno-undefined-var-template",
-                "-Wno-nonportable-include-path",
-                "-Wno-address-of-packed-member",
-                "-Wno-unused-lambda-capture",
-                "-Wno-user-defined-warnings",
-                "-O0",
-                "-fno-omit-frame-pointer",
-                "-g2",
-                "-fvisibility=hidden",
-                "-Xclang",
-                "-add-plugin",
-                "-Xclang",
-                "find-bad-constructs",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-auto-raw-pointer",
-                "-Wheader-hygiene",
-                "-Wstring-conversion",
-                "-Wtautological-overlap-compare",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow",
-                "-Wc++11-narrowing",
-                "-Wimplicit-fallthrough",
-                "-Wthread-safety",
-                "-Winconsistent-missing-override",
-                "-Wundef",
-                "-Wunused-lambda-capture"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "DYNAMIC_ANNOTATIONS_ENABLED=1",
-                "WTF_USE_DYNAMIC_ANNOTATIONS=1",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_BSD"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -13781,9 +13694,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/x86_True_x86_netbsd.json
+++ b/media/webrtc/gn-configs/x86_True_x86_netbsd.json
@@ -75,17 +75,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -10026,75 +10025,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-m32",
-                "-msse2",
-                "-mfpmath=sse",
-                "-mmmx",
-                "-Wall",
-                "-Werror",
-                "-Wno-unused-local-typedefs",
-                "-Wno-maybe-uninitialized",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-O0",
-                "-fno-omit-frame-pointer",
-                "-g2",
-                "-fvisibility=hidden",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "DYNAMIC_ANNOTATIONS_ENABLED=1",
-                "WTF_USE_DYNAMIC_ANNOTATIONS=1",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_BSD"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -10258,9 +10198,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/x86_True_x86_openbsd.json
+++ b/media/webrtc/gn-configs/x86_True_x86_openbsd.json
@@ -102,17 +102,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -13476,102 +13475,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "-fno-strict-aliasing",
-                "--param=ssp-buffer-size=4",
-                "-fstack-protector",
-                "-Wno-builtin-macro-redefined",
-                "-D__DATE__=",
-                "-D__TIME__=",
-                "-D__TIMESTAMP__=",
-                "-funwind-tables",
-                "-fcolor-diagnostics",
-                "-m32",
-                "-msse2",
-                "-mfpmath=sse",
-                "-mmmx",
-                "-momit-leaf-frame-pointer",
-                "-Wall",
-                "-Werror",
-                "-Wextra",
-                "-Wno-missing-field-initializers",
-                "-Wno-unused-parameter",
-                "-Wno-c++11-narrowing",
-                "-Wno-covered-switch-default",
-                "-Wno-unneeded-internal-declaration",
-                "-Wno-inconsistent-missing-override",
-                "-Wno-undefined-var-template",
-                "-Wno-nonportable-include-path",
-                "-Wno-address-of-packed-member",
-                "-Wno-unused-lambda-capture",
-                "-Wno-user-defined-warnings",
-                "-O0",
-                "-fno-omit-frame-pointer",
-                "-g2",
-                "-fvisibility=hidden",
-                "-Xclang",
-                "-add-plugin",
-                "-Xclang",
-                "find-bad-constructs",
-                "-Xclang",
-                "-plugin-arg-find-bad-constructs",
-                "-Xclang",
-                "check-auto-raw-pointer",
-                "-Wheader-hygiene",
-                "-Wstring-conversion",
-                "-Wtautological-overlap-compare",
-                "-Wextra",
-                "-Wno-unused-parameter",
-                "-Wno-missing-field-initializers",
-                "-Wno-strict-overflow",
-                "-Wc++11-narrowing",
-                "-Wimplicit-fallthrough",
-                "-Wthread-safety",
-                "-Winconsistent-missing-override",
-                "-Wundef",
-                "-Wunused-lambda-capture"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "USE_X11=1",
-                "CHROMIUM_BUILD",
-                "_FILE_OFFSET_BITS=64",
-                "DYNAMIC_ANNOTATIONS_ENABLED=1",
-                "WTF_USE_DYNAMIC_ANNOTATIONS=1",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_POSIX",
-                "WEBRTC_BSD"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "/tmp/objdir/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "-fno-strict-aliasing",
                 "--param=ssp-buffer-size=4",
                 "-fstack-protector",
                 "-Wno-builtin-macro-redefined",
                 "-D__DATE__=",
                 "-D__TIME__=",
@@ -13781,9 +13694,9 @@
                 "//voice_engine/voe_base_impl.cc",
                 "//voice_engine/voe_base_impl.h",
                 "//voice_engine/voice_engine_impl.cc",
                 "//voice_engine/voice_engine_impl.h"
             ],
             "type": "static_library"
         }
     }
-}
\ No newline at end of file
+}
--- a/media/webrtc/gn-configs/x86_True_x86_win.json
+++ b/media/webrtc/gn-configs/x86_True_x86_win.json
@@ -108,17 +108,16 @@
                 "//media:media",
                 "//modules:modules",
                 "//modules/video_capture:video_capture_internal_impl",
                 "//rtc_base:rtc_base",
                 "//system_wrappers:field_trial_default",
                 "//system_wrappers:metrics_default",
                 "//system_wrappers:system_wrappers_default",
                 "//video:video",
-                "//video_engine:video_engine",
                 "//voice_engine:voice_engine"
             ],
             "include_dirs": [
                 "//",
                 "c:/src/firefox/obj-i686-pc-mingw32/media/webrtc/trunk/webrtc/gn-output/gen/",
                 "//common_audio/resampler/include/",
                 "//common_audio/signal_processing/include/",
                 "//common_audio/vad/include/",
@@ -14763,108 +14762,16 @@
                 "//video/video_send_stream.h",
                 "//video/video_stream_decoder.cc",
                 "//video/video_stream_decoder.h",
                 "//video/video_stream_encoder.cc",
                 "//video/video_stream_encoder.h"
             ],
             "type": "static_library"
         },
-        "//video_engine:video_engine": {
-            "cflags": [
-                "/wd4117",
-                "/D__DATE__=",
-                "/D__TIME__=",
-                "/D__TIMESTAMP__=",
-                "/Gy",
-                "/FS",
-                "/bigobj",
-                "/d2FastFail",
-                "/Zc:sizedDealloc-",
-                "/W4",
-                "/WX",
-                "/utf-8",
-                "/wd4091",
-                "/wd4127",
-                "/wd4251",
-                "/wd4312",
-                "/wd4351",
-                "/wd4355",
-                "/wd4503",
-                "/wd4589",
-                "/wd4611",
-                "/wd4100",
-                "/wd4121",
-                "/wd4244",
-                "/wd4505",
-                "/wd4510",
-                "/wd4512",
-                "/wd4610",
-                "/wd4838",
-                "/wd4995",
-                "/wd4996",
-                "/wd4456",
-                "/wd4457",
-                "/wd4458",
-                "/wd4459",
-                "/wd4267",
-                "/Od",
-                "/Ob0",
-                "/GF",
-                "/Zi",
-                "/MTd"
-            ],
-            "defines": [
-                "V8_DEPRECATION_WARNINGS",
-                "NO_TCMALLOC",
-                "CHROMIUM_BUILD",
-                "__STD_C",
-                "_CRT_RAND_S",
-                "_CRT_SECURE_NO_DEPRECATE",
-                "_HAS_EXCEPTIONS=0",
-                "_SCL_SECURE_NO_DEPRECATE",
-                "_ATL_NO_OPENGL",
-                "_WINDOWS",
-                "CERT_CHAIN_PARA_HAS_EXTRA_FIELDS",
-                "PSAPI_VERSION=1",
-                "WIN32",
-                "_SECURE_ATL",
-                "_USING_V110_SDK71_",
-                "WIN32_LEAN_AND_MEAN",
-                "NOMINMAX",
-                "_UNICODE",
-                "UNICODE",
-                "NTDDI_VERSION=0x0A000000",
-                "_WIN32_WINNT=0x0A00",
-                "WINVER=0x0A00",
-                "DYNAMIC_ANNOTATIONS_ENABLED=1",
-                "WTF_USE_DYNAMIC_ANNOTATIONS=1",
-                "WEBRTC_ENABLE_PROTOBUF=0",
-                "WEBRTC_RESTRICT_LOGGING",
-                "WEBRTC_MOZILLA_BUILD",
-                "WEBRTC_NON_STATIC_TRACE_EVENT_HANDLERS=0",
-                "WEBRTC_WIN",
-                "_CRT_SECURE_NO_WARNINGS"
-            ],
-            "deps": [
-                "//:webrtc_common"
-            ],
-            "include_dirs": [
-                "/media/libyuv/libyuv/include/",
-                "//",
-                "c:/src/firefox/obj-i686-pc-mingw32/media/webrtc/trunk/webrtc/gn-output/gen/"
-            ],
-            "libs": [],
-            "sources": [
-                "//video_engine/browser_capture_impl.h",
-                "//video_engine/desktop_capture_impl.cc",
-                "//video_engine/desktop_capture_impl.h"
-            ],
-            "type": "static_library"
-        },
         "//voice_engine:audio_level": {
             "cflags": [
                 "/wd4117",
                 "/D__DATE__=",
                 "/D__TIME__=",
                 "/D__TIMESTAMP__=",
                 "/Gy",
                 "/FS",