From 0ba75aa318bbef343d1324ff6d91d43fdd853c3b Mon Sep 17 00:00:00 2001
From: Bryan Bernhart <bryan.bernhart@intel.com>
Date: Wed, 19 Jul 2023 09:50:27 -0700
Subject: [PATCH] Remove build_with_chromium cases for tests.

Chromium requires seperate Main cpps, which isn't available, so disable the buildflag for now.
---
 src/tests/BUILD.gn | 28 +++++-----------------------
 1 file changed, 5 insertions(+), 23 deletions(-)

diff --git a/src/tests/BUILD.gn b/src/tests/BUILD.gn
index 5d9cda77d..81c49a20b 100644
--- a/src/tests/BUILD.gn
+++ b/src/tests/BUILD.gn
@@ -23,7 +23,7 @@ group("gpgmm_tests") {
   deps = [
     ":gpgmm_capture_replay_tests",
     ":gpgmm_end2end_tests",
-    ":gpgmm_perftests",
+    ":gpgmm_perf_tests",
     ":gpgmm_unittests",
   ]
 }
@@ -124,13 +124,7 @@ test("gpgmm_unittests") {
     "unittests/UtilsTest.cpp",
   ]
 
-  # When building inside Chromium, use their gtest main function because it is
-  # needed to run in swarming correctly.
-  if (build_with_chromium) {
-    deps += [ ":gpgmm_unittests_main" ]
-  } else {
-    sources += [ "UnittestsMain.cpp" ]
-  }
+  sources += [ "UnittestsMain.cpp" ]
 }
 
 ###############################################################################
@@ -191,13 +185,7 @@ test("gpgmm_end2end_tests") {
 
   libs = []
 
-  # When building inside Chromium, use their gtest main function because it is
-  # needed to run in swarming correctly.
-  if (build_with_chromium) {
-    deps += [ ":gpgmm_end2end_tests_main" ]
-  } else {
-    sources += [ "End2EndTestsMain.cpp" ]
-  }
+  sources += [ "End2EndTestsMain.cpp" ]
 
   if (is_chromeos) {
     libs += [ "gbm" ]
@@ -287,13 +275,7 @@ test("gpgmm_capture_replay_tests") {
 
   libs = []
 
-  # When building inside Chromium, use their gtest main function because it is
-  # needed to run in swarming correctly.
-  if (build_with_chromium) {
-    deps += [ ":gpgmm_capture_replay_tests_main" ]
-  } else {
-    sources += [ "CaptureReplayTestsMain.cpp" ]
-  }
+  sources += [ "CaptureReplayTestsMain.cpp" ]
 
   if (is_chromeos) {
     libs += [ "gbm" ]
@@ -304,7 +286,7 @@ test("gpgmm_capture_replay_tests") {
 # Performance tests
 ###############################################################################
 
-test("gpgmm_perftests") {
+test("gpgmm_perf_tests") {
   configs += [ "${gpgmm_root_dir}/src/gpgmm/common:gpgmm_common_config" ]
 
   deps = [