| Index: webrtc/test/BUILD.gn | 
| diff --git a/webrtc/test/BUILD.gn b/webrtc/test/BUILD.gn | 
| index 64b6e03919cf0e9011c285d2265aa5894e52ca7e..9554ccf2f9e02fb51a372faafae0728729e68b94 100644 | 
| --- a/webrtc/test/BUILD.gn | 
| +++ b/webrtc/test/BUILD.gn | 
| @@ -53,13 +53,9 @@ | 
| } | 
|  | 
| deps = [ | 
| -    "..:webrtc_common", | 
| -    "../base:rtc_base_approved", | 
| -    "../base:rtc_task_queue", | 
| "../common_video", | 
| "../media:rtc_media_base", | 
| "../modules/video_capture:video_capture_module", | 
| -    "../system_wrappers", | 
| ] | 
| } | 
|  | 
| @@ -81,7 +77,6 @@ | 
|  | 
| deps = [ | 
| "..:webrtc_common", | 
| -    "../base:rtc_base_approved", | 
| "../modules/rtp_rtcp", | 
| "//testing/gtest", | 
| ] | 
| @@ -112,7 +107,6 @@ | 
| ] | 
| deps = [ | 
| ":field_trial", | 
| -    "../base:rtc_base_approved", | 
| "../system_wrappers:metrics_default", | 
| "//testing/gmock", | 
| "//testing/gtest", | 
| @@ -131,16 +125,6 @@ | 
| configs += [ "//build/config/compiler:enable_arc" ] | 
| } | 
| visibility = [ ":*" ] | 
| -  deps = [ | 
| -    "..:webrtc_common", | 
| -    "../base:rtc_base_approved", | 
| -  ] | 
| -  if (is_ios) { | 
| -    deps += [ "../sdk:rtc_sdk_common_objc" ] | 
| -  } | 
| -  if (is_win) { | 
| -    deps += [ "../base:rtc_base" ] | 
| -  } | 
| } | 
|  | 
| rtc_source_set("video_test_support") { | 
| @@ -159,9 +143,6 @@ | 
| ] | 
|  | 
| deps = [ | 
| -    ":test_support", | 
| -    ":video_test_common", | 
| -    "..:webrtc_common", | 
| "../base:rtc_base_approved", | 
| "../common_video", | 
| "../system_wrappers", | 
| @@ -210,7 +191,6 @@ | 
| ] | 
|  | 
| deps = [ | 
| -    "..:webrtc_common", | 
| "../base:gtest_prod", | 
| "../base:rtc_base_approved", | 
| "../common_video", | 
| @@ -316,20 +296,12 @@ | 
|  | 
| deps += [ | 
| ":direct_transport", | 
| -    ":fake_audio_device", | 
| ":fileutils_unittests", | 
| -    ":rtp_test_utils", | 
| ":test_common", | 
| ":test_main", | 
| ":video_test_common", | 
| ":video_test_support", | 
| -    "../api:video_frame_api", | 
| -    "../base:rtc_base_approved", | 
| -    "../call:call_interfaces", | 
| -    "../common_audio", | 
| -    "../modules/rtp_rtcp", | 
| "../modules/video_capture", | 
| -    "../system_wrappers", | 
| "//testing/gmock", | 
| "//testing/gtest", | 
| "//third_party/gflags", | 
| @@ -342,7 +314,6 @@ | 
| ] | 
| deps = [ | 
| ":fileutils", | 
| -    ":test_support", | 
| "//testing/gmock", | 
| "//testing/gtest", | 
| ] | 
| @@ -361,12 +332,9 @@ | 
| suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
| } | 
| deps = [ | 
| -    "..:webrtc_common", | 
| "../api:transport_api", | 
| "../base:rtc_base_approved", | 
| "../call", | 
| -    "../modules/rtp_rtcp", | 
| -    "../system_wrappers", | 
| ] | 
| } | 
|  | 
| @@ -381,11 +349,8 @@ | 
| suppressed_configs += [ "//build/config/clang:find_bad_constructs" ] | 
| } | 
| deps = [ | 
| -    "..:webrtc_common", | 
| "../base:rtc_base_approved", | 
| -    "../common_audio", | 
| -    "../modules/audio_device", | 
| -    "../system_wrappers", | 
| +    "../modules/audio_device:audio_device", | 
| ] | 
| } | 
|  | 
| @@ -438,25 +403,13 @@ | 
| ":test_support", | 
| ":video_test_common", | 
| "..:webrtc_common", | 
| -    "../api:transport_api", | 
| -    "../api:video_frame_api", | 
| -    "../api/audio_codecs:builtin_audio_decoder_factory", | 
| "../api/video_codecs:video_codecs_api", | 
| "../audio", | 
| "../base:rtc_base_approved", | 
| -    "../base:rtc_task_queue", | 
| "../call", | 
| -    "../logging:rtc_event_log_api", | 
| -    "../modules/audio_device:mock_audio_device", | 
| "../modules/audio_mixer:audio_mixer_impl", | 
| "../modules/audio_processing", | 
| -    "../modules/rtp_rtcp:rtp_rtcp", | 
| -    "../modules/video_coding:webrtc_h264", | 
| -    "../modules/video_coding:webrtc_vp8", | 
| -    "../modules/video_coding:webrtc_vp9", | 
| -    "../system_wrappers", | 
| "../video", | 
| -    "../voice_engine", | 
| "//testing/gmock", | 
| "//testing/gtest", | 
| ] | 
| @@ -532,9 +485,6 @@ | 
|  | 
| deps = [ | 
| ":test_support", | 
| -    "..:webrtc_common", | 
| -    "../base:rtc_base_approved", | 
| -    "../common_video", | 
| "../modules/media_file", | 
| "//testing/gtest", | 
| ] | 
| @@ -546,10 +496,4 @@ | 
| "mock_audio_decoder.h", | 
| "mock_audio_decoder_factory.h", | 
| ] | 
| -  deps = [ | 
| -    ":test_support", | 
| -    "../api/audio_codecs:audio_codecs_api", | 
| -    "../api/audio_codecs:builtin_audio_decoder_factory", | 
| -    "../base:rtc_base_approved", | 
| -  ] | 
| -} | 
| +} | 
|  |