| Index: webrtc/modules/video_coding/BUILD.gn | 
| diff --git a/webrtc/modules/video_coding/BUILD.gn b/webrtc/modules/video_coding/BUILD.gn | 
| index a3ad4b37c711eb597e06c4633f73bb6a9d026366..c4c370328ade30e7f685f95565f8f35093469937 100644 | 
| --- a/webrtc/modules/video_coding/BUILD.gn | 
| +++ b/webrtc/modules/video_coding/BUILD.gn | 
| @@ -341,13 +341,13 @@ if (rtc_include_tests) { | 
| ] | 
| } | 
|  | 
| -  rtc_source_set("video_coding_modules_tests") { | 
| +  rtc_source_set("video_coding_videoprocessor_integration_test") { | 
| testonly = true | 
| + | 
| sources = [ | 
| -      "codecs/test/videoprocessor_integrationtest.cc", | 
| "codecs/test/videoprocessor_integrationtest.h", | 
| -      "codecs/vp8/test/vp8_impl_unittest.cc", | 
| ] | 
| + | 
| deps = [ | 
| ":video_codecs_test_framework", | 
| ":video_coding", | 
| @@ -355,18 +355,116 @@ if (rtc_include_tests) { | 
| ":webrtc_vp8", | 
| ":webrtc_vp9", | 
| "../..:webrtc_common", | 
| +      "../../media:rtc_media", | 
| +      "../../test:test_support", | 
| +      "../../test:video_test_support", | 
| +    ] | 
| + | 
| +    if (is_android) { | 
| +      sources += [ | 
| +        "codecs/test/android_test_initializer.cc", | 
| +        "codecs/test/android_test_initializer.h", | 
| +      ] | 
| + | 
| +      deps += [ | 
| +        "../../base:rtc_base_approved", | 
| +        "../../sdk/android:libjingle_peerconnection_jni", | 
| +        "//base", | 
| +      ] | 
| +    } | 
| + | 
| +    if (is_ios) { | 
| +      deps += [ | 
| +        "../../media:rtc_media_base", | 
| +        "../../sdk:webrtc_h264_video_toolbox", | 
| +      ] | 
| +    } | 
| +  } | 
| + | 
| +  rtc_source_set("video_coding_modules_tests") { | 
| +    testonly = true | 
| + | 
| +    sources = [ | 
| +      "codecs/test/videoprocessor_integrationtest.cc", | 
| +      "codecs/vp8/test/vp8_impl_unittest.cc", | 
| +    ] | 
| + | 
| +    deps = [ | 
| +      ":video_coding_videoprocessor_integration_test", | 
| +      ":webrtc_vp8", | 
| "../../api:video_frame_api", | 
| "../../base:rtc_base_approved", | 
| "../../common_video:common_video", | 
| -      "../../media:rtc_media_base", | 
| "../../test:test_support", | 
| "../../test:video_test_common", | 
| -      "../../test:video_test_support", | 
| "../video_capture", | 
| ] | 
| + | 
| if (rtc_use_h264) { | 
| defines = [ "WEBRTC_VIDEOPROCESSOR_H264_TESTS" ] | 
| } | 
| + | 
| +    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" ] | 
| +    } | 
| +  } | 
| + | 
| +  plot_videoprocessor_integrationtest_resources = [ | 
| +    "//resources/foreman_sqcif.yuv", | 
| +    "//resources/foreman_qqvga.yuv", | 
| +    "//resources/foreman_qcif.yuv", | 
| +    "//resources/foreman_qvga.yuv", | 
| +    "//resources/foreman_cif.yuv", | 
| +  ] | 
| + | 
| +  if (is_ios) { | 
| +    bundle_data("plot_videoprocessor_integrationtest_bundle_data") { | 
| +      testonly = true | 
| +      sources = plot_videoprocessor_integrationtest_resources | 
| +      outputs = [ | 
| +        "{{bundle_resources_dir}}/{{source_file_part}}", | 
| +      ] | 
| +    } | 
| +  } | 
| + | 
| +  # This executable is meant for local codec perf testing and should not be run | 
| +  # on the trybots/buildbots, hence the existence of this special build target. | 
| +  rtc_test("plot_videoprocessor_integrationtest") { | 
| +    testonly = true | 
| + | 
| +    sources = [ | 
| +      "codecs/test/plot_videoprocessor_integrationtest.cc", | 
| +    ] | 
| + | 
| +    deps = [ | 
| +      ":video_coding_videoprocessor_integration_test", | 
| +      "../../test:test_main", | 
| +      "../../test:video_test_common", | 
| +      "../video_capture", | 
| +    ] | 
| + | 
| +    data = plot_videoprocessor_integrationtest_resources | 
| + | 
| +    if (is_android) { | 
| +      deps += [ | 
| +        "../../base:rtc_base_approved", | 
| + | 
| +        # TODO(brandtr): Figure out if the java dep below could be moved into | 
| +        # :video_coding_videoprocessor_integration_test, where it belongs. | 
| +        "../../sdk/android:libjingle_peerconnection_java", | 
| +        "../../sdk/android:libjingle_peerconnection_jni", | 
| +        "//base", | 
| +        "//testing/android/native_test:native_test_support", | 
| +      ] | 
| + | 
| +      shard_timeout = 900 | 
| +    } | 
| + | 
| +    if (is_ios) { | 
| +      deps += [ ":plot_videoprocessor_integrationtest_bundle_data" ] | 
| +    } | 
| + | 
| 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" ] | 
|  |