Move frame_generator_capture.{cc, h} and video_capturer.h to video_test_common.

webrtc/test/BUILD.gn

 # Copyright (c) 2014 The WebRTC project authors. All Rights Reserved.
 #
 # Use of this source code is governed by a BSD-style license
 # that can be found in the LICENSE file in the root of the source
 # tree. An additional intellectual property rights grant can be found
 # in the file PATENTS.  All contributing project authors may
 # be found in the AUTHORS file in the root of the source tree.
 
 import("../webrtc.gni")
 import("//build/config/ui.gni")
@@ skipping 19 matching lines @@
   ]
 }
 
 rtc_source_set("video_test_common") {
   testonly = true
   sources = [
     "fake_texture_frame.cc",
     "fake_texture_frame.h",
     "frame_generator.cc",
     "frame_generator.h",
+    "frame_generator_capturer.cc",
+    "frame_generator_capturer.h",
     "frame_utils.cc",
     "frame_utils.h",
+    "video_capturer.h",
   ]
 
   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" ]
   }
 
   deps = [
     "../common_video",
   ]
@@ skipping 233 matching lines @@
     "encoder_settings.h",
     "fake_audio_device.cc",
     "fake_audio_device.h",
     "fake_decoder.cc",
     "fake_decoder.h",
     "fake_encoder.cc",
     "fake_encoder.h",
     "fake_network_pipe.cc",
     "fake_network_pipe.h",
     "fake_videorenderer.h",
-    "frame_generator_capturer.cc",
-    "frame_generator_capturer.h",
     "layer_filtering_transport.cc",
     "layer_filtering_transport.h",
     "mock_transport.h",
     "mock_voe_channel_proxy.h",
     "mock_voice_engine.h",
     "null_transport.cc",
     "null_transport.h",
     "rtp_rtcp_observer.h",
     "statistics.cc",
     "statistics.h",
     "vcm_capturer.cc",
     "vcm_capturer.h",
-    "video_capturer.h",
     "win/run_loop_win.cc",
   ]
   if (!is_win) {
     sources += [
       "run_loop.cc",
       "run_loop.h",
     ]
   }
 
   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" ]
   }
 
   deps = [
     ":rtp_test_utils",
     ":test_support",
     "..:webrtc_common",
     "../api:transport_api",
     "../audio",
     "../base:rtc_base_approved",
     "../call",
     "../modules/audio_device:mock_audio_device",
     "../modules/audio_mixer:audio_mixer_impl",
     "../modules/audio_processing",
-    "../modules/video_capture:video_capture",
     "../modules/video_capture:video_capture_module",

[perkj_webrtc, 2017/02/03 06:51:32]

Can you remove video_capture_module dependency as well?

[ehmaldonado_webrtc, 2017/02/03 08:13:07]

vcm_capturer.{cc, h} needs it, should I move it to video_test_common too, or to
another target?

     "../video",
     "//testing/gmock",
     "//testing/gtest",
   ]
 }
 
 config("test_renderer_exported_config") {
   if (is_win && is_clang) {
     # GN orders flags on a target before flags from configs. The default config
     # adds -Wall, and this flag have to be after -Wall -- so they need to
@@ skipping 58 matching lines @@
     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
   }
 
   deps = [
     ":test_support",
     ":video_test_common",
     "../modules/media_file",
     "//testing/gtest",
   ]
 }