| Index: webrtc/modules/BUILD.gn
 | 
| diff --git a/webrtc/modules/BUILD.gn b/webrtc/modules/BUILD.gn
 | 
| index 44cb1ebd51cf2ceeba10826fe78e55b9076a8f1a..1d247dba06f53b099d3168a951302ed3fbf91030 100644
 | 
| --- a/webrtc/modules/BUILD.gn
 | 
| +++ b/webrtc/modules/BUILD.gn
 | 
| @@ -50,62 +50,16 @@ if (rtc_include_tests) {
 | 
|    rtc_test("modules_tests") {
 | 
|      testonly = true
 | 
|  
 | 
| -    videoprocessor_defines = []
 | 
| -    if (rtc_use_h264) {
 | 
| -      videoprocessor_defines += [ "WEBRTC_VIDEOPROCESSOR_H264_TESTS" ]
 | 
| -    }
 | 
| -
 | 
| -    defines = audio_coding_defines + videoprocessor_defines
 | 
| -
 | 
|      deps = [
 | 
| -      "..:webrtc_common",
 | 
| -      "../common_video",
 | 
| -      "../media:rtc_media_base",
 | 
| -      "../modules/audio_coding",
 | 
| -      "../modules/audio_coding:audio_format_conversion",
 | 
| -      "../modules/rtp_rtcp",
 | 
| -      "../modules/utility",
 | 
| -      "../modules/video_coding",
 | 
| -      "../modules/video_coding:video_codecs_test_framework",
 | 
| -      "../system_wrappers",
 | 
|        "../test:test_main",
 | 
| +      "audio_coding:audio_coding_modules_tests",
 | 
| +      "desktop_capture:desktop_capture_modules_tests",
 | 
| +      "rtp_rtcp:rtp_rtcp_modules_tests",
 | 
| +      "video_coding:video_coding_modules_tests",
 | 
|        "//testing/gmock",
 | 
|        "//testing/gtest",
 | 
|      ]
 | 
|  
 | 
| -    sources = [
 | 
| -      "audio_coding/test/APITest.cc",
 | 
| -      "audio_coding/test/Channel.cc",
 | 
| -      "audio_coding/test/EncodeDecodeTest.cc",
 | 
| -      "audio_coding/test/PCMFile.cc",
 | 
| -      "audio_coding/test/PacketLossTest.cc",
 | 
| -      "audio_coding/test/RTPFile.cc",
 | 
| -      "audio_coding/test/TestAllCodecs.cc",
 | 
| -      "audio_coding/test/TestRedFec.cc",
 | 
| -      "audio_coding/test/TestStereo.cc",
 | 
| -      "audio_coding/test/TestVADDTX.cc",
 | 
| -      "audio_coding/test/Tester.cc",
 | 
| -      "audio_coding/test/TwoWayCommunication.cc",
 | 
| -      "audio_coding/test/iSACTest.cc",
 | 
| -      "audio_coding/test/opus_test.cc",
 | 
| -      "audio_coding/test/target_delay_unittest.cc",
 | 
| -      "audio_coding/test/utility.cc",
 | 
| -      "rtp_rtcp/test/testFec/test_fec.cc",
 | 
| -      "video_coding/codecs/test/videoprocessor_integrationtest.cc",
 | 
| -      "video_coding/codecs/vp8/test/vp8_impl_unittest.cc",
 | 
| -    ]
 | 
| -
 | 
| -    if (rtc_desktop_capture_supported) {
 | 
| -      deps += [
 | 
| -        "desktop_capture:desktop_capture_mock",
 | 
| -        "desktop_capture:screen_drawer",
 | 
| -      ]
 | 
| -      sources += [
 | 
| -        "desktop_capture/screen_capturer_integration_test.cc",
 | 
| -        "desktop_capture/screen_drawer_unittest.cc",
 | 
| -      ]
 | 
| -    }
 | 
| -
 | 
|      data = modules_tests_resources
 | 
|  
 | 
|      if (is_android) {
 | 
| @@ -291,37 +245,4 @@ if (rtc_include_tests) {
 | 
|        ldflags = [ "-ObjC" ]
 | 
|      }
 | 
|    }
 | 
| -
 | 
| -  rtc_test("bwe_simulator") {
 | 
| -    testonly = true
 | 
| -
 | 
| -    deps = []
 | 
| -    sources = [
 | 
| -      "remote_bitrate_estimator/bwe_simulations.cc",
 | 
| -    ]
 | 
| -
 | 
| -    if (!build_with_chromium && is_clang) {
 | 
| -      # Suppress warnings from the Chromium Clang plugin (bugs.webrtc.org/163).
 | 
| -      suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
 | 
| -    }
 | 
| -
 | 
| -    if (is_win) {
 | 
| -      cflags = [
 | 
| -        # TODO(kjellander): bugs.webrtc.org/261: Fix this warning.
 | 
| -        "/wd4373",  # virtual function override.
 | 
| -      ]
 | 
| -    }
 | 
| -
 | 
| -    deps += [
 | 
| -      "..:webrtc_common",
 | 
| -      "../base:rtc_base_approved",
 | 
| -      "../test:test_common",
 | 
| -      "../test:test_main",
 | 
| -      "remote_bitrate_estimator:bwe_simulator_lib",
 | 
| -      "video_capture",
 | 
| -      "//testing/gmock",
 | 
| -      "//testing/gtest",
 | 
| -      "//third_party/gflags",
 | 
| -    ]
 | 
| -  }
 | 
|  }
 | 
| 
 |