Replace test_support_main by test_main and get rid of test_support_main_threaded_mac

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("../build/webrtc.gni")
 import("//build/config/ui.gni")
 if (is_android) {
   import("//build/config/android/rules.gni")
 }
 if (rtc_use_memcheck) {
   import("//tools/valgrind-webrtc/valgrind-webrtc.gni")
 }
 
 group("test") {
   testonly = true
 
   deps = [
     ":field_trial",
     ":rtp_test_utils",
     ":test_common",
+    ":test_main",
     ":test_renderer",
     ":test_support",
-    ":test_support_main",
     ":test_support_unittests",
     ":video_test_common",
   ]
 }
 
 rtc_source_set("video_test_common") {
   testonly = true
   sources = [
     "fake_texture_frame.cc",
     "fake_texture_frame.h",
@@ skipping 53 matching lines @@
 rtc_source_set("test_main") {
   testonly = true
   sources = [
     "test_main.cc",
   ]
 
   deps = [
     ":field_trial",
     ":test_support",
     "../system_wrappers:metrics_default",
+    "//testing/gmock",
     "//testing/gtest",
     "//third_party/gflags",
   ]
 }
 
 rtc_source_set("test_support") {
   testonly = true
 
   sources = [
     "gmock.h",
@@ skipping 45 matching lines @@
     data = [
       "../build/android/test_runner.py",
     ]
   }
 
   if (rtc_use_memcheck) {
     data = valgrind_webrtc_dependencies
   }
 }
 
-# Depend on this target when you want to have test_support but also the
-# main method needed for gtest to execute!
-rtc_source_set("test_support_main") {
-  testonly = true
-
-  sources = [
-    "run_all_unittests.cc",
-    "test_suite.cc",
-    "test_suite.h",
-  ]
-
-  deps = [
-    ":field_trial",
-    ":test_support",
-    "../system_wrappers:metrics_default",
-    "//testing/gmock",
-    "//testing/gtest",
-    "//third_party/gflags",
-  ]
-}
-
-# Depend on this target when you want to have test_support and a special
-# main for mac which will run your test on a worker thread and consume
-# events on the main thread. Useful if you want to access a webcam.
-# This main will provide all the scaffolding and objective-c black magic
-# for you. All you need to do is to implement a function in the
-# run_threaded_main_mac.h file (ImplementThisToRunYourTest).
-rtc_source_set("test_support_main_threaded_mac") {
-  testonly = true
-
-  sources = [
-    "testsupport/mac/run_threaded_main_mac.h",
-    "testsupport/mac/run_threaded_main_mac.mm",
-  ]
-
-  deps = [
-    ":test_support",
-  ]
-}
-
 rtc_source_set("run_test") {
   testonly = true
   sources = [
     "run_test.h",
   ]
   if (is_mac) {
     sources += [ "mac/run_test.mm" ]
   } else {
     sources += [ "run_test.cc" ]
   }
@@ skipping 53 matching lines @@
     deps += [ "//testing/android/native_test:native_test_support" ]
     shard_timeout = 900
   }
 
   if (is_ios) {
     deps += [ ":test_support_unittests_bundle_data" ]
   }
 
   deps += [
     ":test_common",
-    ":test_support_main",
+    ":test_main",
     "../modules/video_capture",
     "//testing/gmock",
     "//testing/gtest",
   ]
 }
 
 rtc_source_set("test_common") {
   testonly = true
   sources = [
     "call_test.cc",
@@ skipping 130 matching lines @@
     suppressed_configs += [ "//build/config/clang:find_bad_constructs" ]
   }
 
   deps = [
     ":test_support",
     ":video_test_common",
     "../modules/media_file",
     "//testing/gtest",
   ]
 }