Capture/Replay: Move trace fixture into util/

This will allow us to cleanly import the fixture headers
outside of libANGLE. We'll need to call into the trace fixture
in the trace interpreter, which will be in util/.

Bug: angleproject:7752
Change-Id: I3438989db8482924272c69e78d7ac5702e510648
Reviewed-on: https://chromium-review.googlesource.com/c/angle/angle/+/3963363
Reviewed-by: Cody Northrop <cnorthrop@google.com>
Reviewed-by: Yuxin Hu <yuxinhu@google.com>
Commit-Queue: Jamie Madill <jmadill@chromium.org>

BUILD.gn

@@ -1220,33 +1220,6 @@ if (angle_has_frame_capture) {
   }
 }
 
-if (angle_build_tests) {
-  # Used by a few targets that compile traces.
-  config("angle_trace_fixture_config") {
-    include_dirs = [ "src/libANGLE/capture" ]
-  }
-
-  angle_source_set("angle_trace_fixture") {
-    testonly = true
-    defines = [ "ANGLE_REPLAY_IMPLEMENTATION" ]
-    suppressed_configs += [ "$angle_root:constructor_and_destructor_warnings" ]
-    sources = [
-      "src/libANGLE/capture/trace_fixture.cpp",
-      "src/libANGLE/capture/trace_fixture.h",
-    ]
-    public_deps = [
-      ":includes",
-      "util:angle_trace_loader",
-    ]
-    include_dirs = [ "." ]
-    public_configs = [ ":angle_trace_fixture_config" ]
-    if (is_ios) {
-      # shared libraries are hidden inside ios_framework_bundle, but we include headers from them
-      check_includes = false
-    }
-  }
-}
-
 config("shared_library_public_config") {
   if (is_mac && !is_component_build) {
     # Executable targets that depend on the shared libraries below need to have

gni/angle.gni

@@ -590,7 +590,7 @@ template("angle_trace") {
     defines = [ "ANGLE_REPLAY_IMPLEMENTATION" ]
     suppressed_configs += [ "$angle_root:constructor_and_destructor_warnings" ]
 
-    deps = [ "$angle_root:angle_trace_fixture" ]
+    deps = [ "$angle_root/util:angle_trace_fixture" ]
 
     if (is_android) {
       libs = [ "log" ]

util/BUILD.gn

@@ -195,7 +195,6 @@ angle_shared_library("angle_trace_loader") {
   defines = [ "ANGLE_TRACE_LOADER_IMPLEMENTATION" ]
 
   sources = [
-    "capture/angle_trace_gl.h",
     "capture/trace_egl_loader_autogen.cpp",
     "capture/trace_egl_loader_autogen.h",
     "capture/trace_gles_loader_autogen.cpp",
@@ -213,6 +212,25 @@ angle_shared_library("angle_trace_loader") {
   ]
 }
 
+angle_source_set("angle_trace_fixture") {
+  testonly = true
+  defines = [ "ANGLE_REPLAY_IMPLEMENTATION" ]
+  suppressed_configs += [ "$angle_root:constructor_and_destructor_warnings" ]
+  sources = [
+    "capture/angle_trace_gl.h",
+    "capture/trace_fixture.cpp",
+    "capture/trace_fixture.h",
+  ]
+  public_deps = [
+    ":angle_trace_loader",
+    "$angle_root:includes",
+  ]
+  if (is_ios) {
+    # shared libraries are hidden inside ios_framework_bundle, but we include headers from them
+    check_includes = false
+  }
+}
+
 config("angle_util_config") {
   # Force users to include "util/header.h" instead of just "header.h".
   include_dirs = [ ".." ]