Perf Tests: Register trace tests programatically.

src/tests/BUILD.gn

@@ -383,6 +383,12 @@ if (is_win || is_linux || is_chromeos || is_android || is_apple) {
 if (build_angle_perftests) {
   import("angle_perftests.gni")
 
+  config("angle_trace_perftests_config") {
+    if (build_angle_trace_perf_tests) {
+      defines = [ "ANGLE_TRACE_PERF_TESTS" ]
+    }
+  }
+
   angle_source_set("angle_trace_perftests") {
     testonly = true
 
@@ -402,6 +408,7 @@ if (build_angle_perftests) {
         "$angle_root/util:angle_png_utils",
         "restricted_traces:angle_restricted_traces",
       ]
+      public_configs = [ ":angle_trace_perftests_config" ]
       suppressed_configs +=
           [ "$angle_root:constructor_and_destructor_warnings" ]
     }

src/tests/angle_perftests_main.cpp

@@ -13,9 +13,16 @@
 
 void ANGLEProcessPerfTestArgs(int *argc, char **argv);
 
+#if defined(ANGLE_TRACE_PERF_TESTS)
+void RegisterTraceTests();
+#endif  // defined(ANGLE_TRACE_PERF_TESTS)
+
 int main(int argc, char **argv)
 {
-    angle::TestSuite testSuite(&argc, argv);
     ANGLEProcessPerfTestArgs(&argc, argv);
+#if defined(ANGLE_TRACE_PERF_TESTS)
+    RegisterTraceTests();
+#endif  // defined(ANGLE_TRACE_PERF_TESTS)
+    angle::TestSuite testSuite(&argc, argv);
     return testSuite.run();
 }

src/tests/perf_tests/ANGLEPerfTestArgs.cpp

@@ -53,8 +53,6 @@ using namespace angle;
 
 void ANGLEProcessPerfTestArgs(int *argc, char **argv)
 {
-    int argcOutCount = 0;
-
     for (int argIndex = 0; argIndex < *argc; argIndex++)
     {
         if (strcmp("--one-frame-only", argv[argIndex]) == 0)
@@ -159,11 +157,5 @@ void ANGLEProcessPerfTestArgs(int *argc, char **argv)
         {
             gMinimizeGPUWork = true;
         }
-        else
-        {
-            argv[argcOutCount++] = argv[argIndex];
-        }
     }
-
-    *argc = argcOutCount;
 }