Move goldens and data to test_infra. (#4731)

packages/devtools_app/analysis_options.yaml

diff --git a/packages/devtools_app/analysis_options.yaml b/packages/devtools_app/analysis_options.yaml
index 676aa68..923a271 100644
--- a/packages/devtools_app/analysis_options.yaml
+++ b/packages/devtools_app/analysis_options.yaml
@@ -9,4 +9,4 @@
     # for testing so should be ignored. Uncomment this while modifying
     # these files if you want to ensure code is not invalid except where
     # expected.
-    - test/test_data/syntax_highlighting/**
+    - test/test_infra/test_data/syntax_highlighting/**

packages/devtools_app/test/README.md

diff --git a/packages/devtools_app/test/README.md b/packages/devtools_app/test/README.md
index 6ebfc6d..45574bd 100644
--- a/packages/devtools_app/test/README.md
+++ b/packages/devtools_app/test/README.md
@@ -1,7 +1,4 @@
 DevTools tests are grouped by their respective screen (if applicable). If a test is for feature that does not belong to
 a single screen, it should be placed inside `test/shared/`.
 
-Other directories of interest:
-- `test/test_data/`: stubbed test data to be used across tests.
-- `test/test_infra/`: test driver and environment logic to be used across tests.
-- `test/test_utils/`: testing utilities shared across tests.
\ No newline at end of file
+`test/test_infra/` contains all other than '_test.dart' files.

packages/devtools_app/test/app_size/app_size_screen_test.dart

diff --git a/packages/devtools_app/test/app_size/app_size_screen_test.dart b/packages/devtools_app/test/app_size/app_size_screen_test.dart
index a37ec01..e077204 100644
--- a/packages/devtools_app/test/app_size/app_size_screen_test.dart
+++ b/packages/devtools_app/test/app_size/app_size_screen_test.dart
@@ -21,13 +21,13 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 
-import '../test_data/app_size/deferred_app.dart';
-import '../test_data/app_size/diff_deferred_app.dart';
-import '../test_data/app_size/diff_no_deferred_app.dart';
-import '../test_data/app_size/new_v8.dart';
-import '../test_data/app_size/old_v8.dart';
-import '../test_data/app_size/sizes.dart';
-import '../test_data/app_size/unsupported_file.dart';
+import '../test_infra/test_data/app_size/deferred_app.dart';
+import '../test_infra/test_data/app_size/diff_deferred_app.dart';
+import '../test_infra/test_data/app_size/diff_no_deferred_app.dart';
+import '../test_infra/test_data/app_size/new_v8.dart';
+import '../test_infra/test_data/app_size/old_v8.dart';
+import '../test_infra/test_data/app_size/sizes.dart';
+import '../test_infra/test_data/app_size/unsupported_file.dart';
 
 void main() {
   setUp(() {

packages/devtools_app/test/app_size/code_size_attribution_test.dart

diff --git a/packages/devtools_app/test/app_size/code_size_attribution_test.dart b/packages/devtools_app/test/app_size/code_size_attribution_test.dart
index 55a536d..1603afb 100644
--- a/packages/devtools_app/test/app_size/code_size_attribution_test.dart
+++ b/packages/devtools_app/test/app_size/code_size_attribution_test.dart
@@ -13,7 +13,7 @@
 import 'package:vm_snapshot_analysis/precompiler_trace.dart';
 import 'package:vm_snapshot_analysis/program_info.dart';
 
-import '../test_data/app_size/precompiler_trace.dart';
+import '../test_infra/test_data/app_size/precompiler_trace.dart';
 
 void main() {
   late CallGraph callGraph;

packages/devtools_app/test/cpu_profiler/cpu_profile_model_test.dart

diff --git a/packages/devtools_app/test/cpu_profiler/cpu_profile_model_test.dart b/packages/devtools_app/test/cpu_profiler/cpu_profile_model_test.dart
index 6e23ae1..03a5f7b 100644
--- a/packages/devtools_app/test/cpu_profiler/cpu_profile_model_test.dart
+++ b/packages/devtools_app/test/cpu_profiler/cpu_profile_model_test.dart
@@ -10,7 +10,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../test_data/cpu_profile.dart';
+import '../test_infra/test_data/cpu_profile.dart';
 
 void main() {
   group('CpuProfileData', () {

packages/devtools_app/test/cpu_profiler/cpu_profile_transformer_test.dart

diff --git a/packages/devtools_app/test/cpu_profiler/cpu_profile_transformer_test.dart b/packages/devtools_app/test/cpu_profiler/cpu_profile_transformer_test.dart
index 5ccca9c..d3d8463 100644
--- a/packages/devtools_app/test/cpu_profiler/cpu_profile_transformer_test.dart
+++ b/packages/devtools_app/test/cpu_profiler/cpu_profile_transformer_test.dart
@@ -7,7 +7,7 @@
 import 'package:devtools_app/src/shared/profiler_utils.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../test_data/cpu_profile.dart';
+import '../test_infra/test_data/cpu_profile.dart';
 
 void main() {
   group('CpuProfileTransformer', () {

packages/devtools_app/test/cpu_profiler/cpu_profiler_controller_test.dart

diff --git a/packages/devtools_app/test/cpu_profiler/cpu_profiler_controller_test.dart b/packages/devtools_app/test/cpu_profiler/cpu_profiler_controller_test.dart
index 56445fb..0e507ed 100644
--- a/packages/devtools_app/test/cpu_profiler/cpu_profiler_controller_test.dart
+++ b/packages/devtools_app/test/cpu_profiler/cpu_profiler_controller_test.dart
@@ -13,7 +13,7 @@
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../test_data/cpu_profile.dart';
+import '../test_infra/test_data/cpu_profile.dart';
 
 void main() {
   final ServiceConnectionManager fakeServiceManager = FakeServiceManager(

packages/devtools_app/test/cpu_profiler/cpu_profiler_test.dart

diff --git a/packages/devtools_app/test/cpu_profiler/cpu_profiler_test.dart b/packages/devtools_app/test/cpu_profiler/cpu_profiler_test.dart
index 05607a0..ca9cb34 100644
--- a/packages/devtools_app/test/cpu_profiler/cpu_profiler_test.dart
+++ b/packages/devtools_app/test/cpu_profiler/cpu_profiler_test.dart
@@ -24,8 +24,8 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 
-import '../test_data/cpu_profile.dart';
 import '../test_infra/matchers.dart';
+import '../test_infra/test_data/cpu_profile.dart';
 
 void main() {
   late CpuProfiler cpuProfiler;
@@ -409,7 +409,7 @@
       await expectLater(
         find.byType(CpuProfiler),
         matchesDevToolsGolden(
-          '../goldens/cpu_profiler_call_tree_no_guidelines.png',
+          '../test_infra/goldens/cpu_profiler_call_tree_no_guidelines.png',
         ),
       );
       await tester.tap(find.byType(DisplayTreeGuidelinesToggle));
@@ -419,7 +419,7 @@
       await expectLater(
         find.byType(CpuProfiler),
         matchesDevToolsGolden(
-          '../goldens/cpu_profiler_call_tree_guidelines.png',
+          '../test_infra/goldens/cpu_profiler_call_tree_guidelines.png',
         ),
       );
       await tester.tap(find.byType(DisplayTreeGuidelinesToggle));
@@ -429,7 +429,7 @@
       await expectLater(
         find.byType(CpuProfiler),
         matchesDevToolsGolden(
-          '../goldens/cpu_profiler_call_tree_no_guidelines.png',
+          '../test_infra/goldens/cpu_profiler_call_tree_no_guidelines.png',
         ),
       );
 
@@ -445,7 +445,7 @@
       await expectLater(
         find.byType(CpuProfiler),
         matchesDevToolsGolden(
-          '../goldens/cpu_profiler_bottom_up_no_guidelines.png',
+          '../test_infra/goldens/cpu_profiler_bottom_up_no_guidelines.png',
         ),
       );
       await tester.tap(find.byType(DisplayTreeGuidelinesToggle));
@@ -455,7 +455,7 @@
       await expectLater(
         find.byType(CpuProfiler),
         matchesDevToolsGolden(
-          '../goldens/cpu_profiler_bottom_up_guidelines.png',
+          '../test_infra/goldens/cpu_profiler_bottom_up_guidelines.png',
         ),
       );
       await tester.tap(find.byType(DisplayTreeGuidelinesToggle));
@@ -465,7 +465,7 @@
       await expectLater(
         find.byType(CpuProfiler),
         matchesDevToolsGolden(
-          '../goldens/cpu_profiler_bottom_up_no_guidelines.png',
+          '../test_infra/goldens/cpu_profiler_bottom_up_no_guidelines.png',
         ),
       );
     });

packages/devtools_app/test/cpu_profiler/profiler_screen_test.dart

diff --git a/packages/devtools_app/test/cpu_profiler/profiler_screen_test.dart b/packages/devtools_app/test/cpu_profiler/profiler_screen_test.dart
index a48a6e7..0526905 100644
--- a/packages/devtools_app/test/cpu_profiler/profiler_screen_test.dart
+++ b/packages/devtools_app/test/cpu_profiler/profiler_screen_test.dart
@@ -20,7 +20,7 @@
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../test_data/cpu_profile.dart';
+import '../test_infra/test_data/cpu_profile.dart';
 
 void main() {
   late ProfilerScreen screen;

packages/devtools_app/test/debugger/debugger_codeview_test.dart

diff --git a/packages/devtools_app/test/debugger/debugger_codeview_test.dart b/packages/devtools_app/test/debugger/debugger_codeview_test.dart
index 30dc6e8..3ba16b4 100644
--- a/packages/devtools_app/test/debugger/debugger_codeview_test.dart
+++ b/packages/devtools_app/test/debugger/debugger_codeview_test.dart
@@ -101,7 +101,7 @@
     );
     await expectLater(
       find.byKey(DebuggerScreenBody.codeViewKey),
-      matchesDevToolsGolden('../goldens/codeview_scrollbars.png'),
+      matchesDevToolsGolden('../test_infra/goldens/codeview_scrollbars.png'),
     );
   });
 

packages/devtools_app/test/debugger/program_explorer_test.dart

diff --git a/packages/devtools_app/test/debugger/program_explorer_test.dart b/packages/devtools_app/test/debugger/program_explorer_test.dart
index b694c61..438e2dc 100644
--- a/packages/devtools_app/test/debugger/program_explorer_test.dart
+++ b/packages/devtools_app/test/debugger/program_explorer_test.dart
@@ -19,7 +19,7 @@
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../test_data/debugger/vm_service_object_tree.dart';
+import '../test_infra/test_data/debugger/vm_service_object_tree.dart';
 import '../test_infra/utils/tree_utils.dart';
 
 void main() {

packages/devtools_app/test/http/curl_command_test.dart

diff --git a/packages/devtools_app/test/http/curl_command_test.dart b/packages/devtools_app/test/http/curl_command_test.dart
index 4defa08..1ddbbd8 100644
--- a/packages/devtools_app/test/http/curl_command_test.dart
+++ b/packages/devtools_app/test/http/curl_command_test.dart
@@ -9,7 +9,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../test_data/network.dart';
+import '../test_infra/test_data/network.dart';
 
 void main() {
   group('NetworkCurlCommand', () {

packages/devtools_app/test/inspector/inspector_integration_test.dart

diff --git a/packages/devtools_app/test/inspector/inspector_integration_test.dart b/packages/devtools_app/test/inspector/inspector_integration_test.dart
index 75b1115..9e14162 100644
--- a/packages/devtools_app/test/inspector/inspector_integration_test.dart
+++ b/packages/devtools_app/test/inspector/inspector_integration_test.dart
@@ -80,7 +80,7 @@
       await expectLater(
         find.byType(InspectorScreenBody),
         matchesDevToolsGolden(
-          '../goldens/integration_inspector_initial_load.png',
+          '../test_infra/goldens/integration_inspector_initial_load.png',
         ),
       );
 
@@ -90,7 +90,7 @@
       await expectLater(
         find.byType(InspectorScreenBody),
         matchesDevToolsGolden(
-          '../goldens/integration_inspector_select_center.png',
+          '../test_infra/goldens/integration_inspector_select_center.png',
         ),
       );
 
@@ -100,7 +100,7 @@
       await expectLater(
         find.byType(InspectorScreenBody),
         matchesDevToolsGolden(
-          '../goldens/integration_inspector_select_center_details_tree.png',
+          '../test_infra/goldens/integration_inspector_select_center_details_tree.png',
         ),
       );
 
@@ -110,7 +110,7 @@
       await expectLater(
         find.byType(InspectorScreenBody),
         matchesDevToolsGolden(
-          '../goldens/integration_inspector_richtext_selected.png',
+          '../test_infra/goldens/integration_inspector_richtext_selected.png',
         ),
       );
 
@@ -132,7 +132,7 @@
       await expectLater(
         find.byType(InspectorScreenBody),
         matchesDevToolsGolden(
-          '../goldens/integration_inspector_scaffold_selected.png',
+          '../test_infra/goldens/integration_inspector_scaffold_selected.png',
         ),
       );
 
@@ -144,7 +144,7 @@
       await expectLater(
         find.byType(InspectorScreenBody),
         matchesDevToolsGolden(
-          '../goldens/integration_animated_physical_model_selected.png',
+          '../test_infra/goldens/integration_animated_physical_model_selected.png',
         ),
       );
 
@@ -437,7 +437,7 @@
       await expectLater(
         find.byType(InspectorScreenBody),
         matchesDevToolsGolden(
-          '../goldens/integration_inspector_errors_1_initial_load.png',
+          '../test_infra/goldens/integration_inspector_errors_1_initial_load.png',
         ),
       );
 
@@ -449,7 +449,7 @@
       await expectLater(
         find.byType(InspectorScreenBody),
         matchesDevToolsGolden(
-          '../goldens/integration_inspector_errors_2_error_selected.png',
+          '../test_infra/goldens/integration_inspector_errors_2_error_selected.png',
         ),
       );
 

packages/devtools_app/test/memory/allocation_tracing/allocation_profile_tracing_view_test.dart

diff --git a/packages/devtools_app/test/memory/allocation_tracing/allocation_profile_tracing_view_test.dart b/packages/devtools_app/test/memory/allocation_tracing/allocation_profile_tracing_view_test.dart
index e632f5b..a669b48 100644
--- a/packages/devtools_app/test/memory/allocation_tracing/allocation_profile_tracing_view_test.dart
+++ b/packages/devtools_app/test/memory/allocation_tracing/allocation_profile_tracing_view_test.dart
@@ -26,7 +26,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../../test_data/memory_allocation.dart';
+import '../../test_infra/test_data/memory_allocation.dart';
 
 // TODO(bkonyi): add tests for multi-isolate support.
 // See https://github.com/flutter/devtools/issues/4537.
@@ -100,7 +100,7 @@
 
     setUpAll(() {
       final rawProfile = File(
-        'test/test_data/memory/allocation_tracing/allocation_trace.json',
+        'test/test_infra/test_data/memory/allocation_tracing/allocation_trace.json',
       ).readAsStringSync();
       allocationTracingProfile = CpuSamples.parse(jsonDecode(rawProfile))!;
     });

packages/devtools_app/test/memory/chart/chart_test.dart

diff --git a/packages/devtools_app/test/memory/chart/chart_test.dart b/packages/devtools_app/test/memory/chart/chart_test.dart
index 997a2aa..c53188b 100644
--- a/packages/devtools_app/test/memory/chart/chart_test.dart
+++ b/packages/devtools_app/test/memory/chart/chart_test.dart
@@ -15,8 +15,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../test_data/memory.dart';
 import '../../test_infra/matchers.dart';
+import '../../test_infra/test_data/memory.dart';
 
 void main() {
   const windowSize = Size(2225.0, 1000.0);
@@ -273,7 +273,9 @@
 
           await expectLater(
             find.byKey(chartKey),
-            matchesDevToolsGolden('../../goldens/memory_chart_scaled_live.png'),
+            matchesDevToolsGolden(
+              '../../test_infra/goldens/memory_chart_scaled_live.png',
+            ),
           );
           // Await delay for golden comparison.
           await tester.pumpAndSettle(const Duration(seconds: 2));
@@ -356,7 +358,9 @@
 
         await expectLater(
           find.byKey(chartKey),
-          matchesDevToolsGolden('../../goldens/memory_chart_scaled_all.png'),
+          matchesDevToolsGolden(
+            '../../test_infra/goldens/memory_chart_scaled_all.png',
+          ),
         );
         // Await delay for golden comparison.
         await tester.pumpAndSettle(const Duration(seconds: 2));
@@ -396,7 +400,7 @@
         await expectLater(
           find.byKey(chartKey),
           matchesDevToolsGolden(
-            '../../goldens/memory_chart_scaled_five_minute.png',
+            '../../test_infra/goldens/memory_chart_scaled_five_minute.png',
           ),
         );
         // Await delay for golden comparison.
@@ -630,7 +634,9 @@
 
           await expectLater(
             find.byKey(chartKey),
-            matchesDevToolsGolden('../../goldens/memory_chart_fixed_live.png'),
+            matchesDevToolsGolden(
+              '../../test_infra/goldens/memory_chart_fixed_live.png',
+            ),
           );
           // Await delay for golden comparison.
           await tester.pumpAndSettle(const Duration(seconds: 2));
@@ -739,7 +745,9 @@
 
         await expectLater(
           find.byKey(chartKey),
-          matchesDevToolsGolden('../../goldens/memory_chart_fixed_all.png'),
+          matchesDevToolsGolden(
+            '../../test_infra/goldens/memory_chart_fixed_all.png',
+          ),
         );
         // Await delay for golden comparison.
         await tester.pumpAndSettle(const Duration(seconds: 2));
@@ -792,7 +800,7 @@
         await expectLater(
           find.byKey(chartKey),
           matchesDevToolsGolden(
-            '../../goldens/memory_chart_fixed_five_minutes.png',
+            '../../test_infra/goldens/memory_chart_fixed_five_minutes.png',
           ),
         );
         // Await delay for golden comparison.

packages/devtools_app/test/memory/control/settings_dialog_test.dart

diff --git a/packages/devtools_app/test/memory/control/settings_dialog_test.dart b/packages/devtools_app/test/memory/control/settings_dialog_test.dart
index 3f7ba8e..5c62030 100644
--- a/packages/devtools_app/test/memory/control/settings_dialog_test.dart
+++ b/packages/devtools_app/test/memory/control/settings_dialog_test.dart
@@ -45,7 +45,9 @@
     await tester.pumpAndSettle();
     await expectLater(
       find.byType(MemorySettingsDialog),
-      matchesDevToolsGolden('../../goldens/settings_dialog_default.png'),
+      matchesDevToolsGolden(
+        '../../test_infra/goldens/settings_dialog_default.png',
+      ),
     );
 
     // Modify settings and check the changes are reflected in the controller.
@@ -58,7 +60,9 @@
     await tester.pumpAndSettle();
     await expectLater(
       find.byType(MemorySettingsDialog),
-      matchesDevToolsGolden('../../goldens/settings_dialog_modified.png'),
+      matchesDevToolsGolden(
+        '../../test_infra/goldens/settings_dialog_modified.png',
+      ),
     );
     expect(
       preferences.memory.androidCollectionEnabled.value,
@@ -72,7 +76,9 @@
     await tester.pumpAndSettle();
     await expectLater(
       find.byType(MemorySettingsDialog),
-      matchesDevToolsGolden('../../goldens/settings_dialog_modified.png'),
+      matchesDevToolsGolden(
+        '../../test_infra/goldens/settings_dialog_modified.png',
+      ),
     );
   });
 }

packages/devtools_app/test/memory/diff/widgets/class_filter_test.dart

diff --git a/packages/devtools_app/test/memory/diff/widgets/class_filter_test.dart b/packages/devtools_app/test/memory/diff/widgets/class_filter_test.dart
index 4d93a63..18e31fa 100644
--- a/packages/devtools_app/test/memory/diff/widgets/class_filter_test.dart
+++ b/packages/devtools_app/test/memory/diff/widgets/class_filter_test.dart
@@ -28,11 +28,11 @@
   String get name => isDiff ? 'diff' : 'single';
 
   String get sceneGolden =>
-      '../../../goldens/memory_diff_snapshot_scene_$name.png';
+      '../../../test_infra/goldens/memory_diff_snapshot_scene_$name.png';
   String snapshotGolden(ClassFilterType? type) =>
-      '../../../goldens/memory_diff_snapshot_${type?.name ?? 'custom'}_$name.png';
+      '../../../test_infra/goldens/memory_diff_snapshot_${type?.name ?? 'custom'}_$name.png';
   static String dialogGolden(ClassFilterType? type) =>
-      '../../../goldens/memory_diff_filter_dialog_${type?.name ?? 'custom'}.png';
+      '../../../test_infra/goldens/memory_diff_filter_dialog_${type?.name ?? 'custom'}.png';
 }
 
 final _tests = [_FilterTest(false), _FilterTest(true)];

packages/devtools_app/test/memory/diff/widgets/diff_pane_test.dart

diff --git a/packages/devtools_app/test/memory/diff/widgets/diff_pane_test.dart b/packages/devtools_app/test/memory/diff/widgets/diff_pane_test.dart
index 707b6c3..7667651 100644
--- a/packages/devtools_app/test/memory/diff/widgets/diff_pane_test.dart
+++ b/packages/devtools_app/test/memory/diff/widgets/diff_pane_test.dart
@@ -49,7 +49,9 @@
       // Check initial golden.
       await expectLater(
         find.byType(DiffPane),
-        matchesDevToolsGolden('../../../goldens/memory_diff_empty1.png'),
+        matchesDevToolsGolden(
+          '../../../test_infra/goldens/memory_diff_empty1.png',
+        ),
       );
 
       // Record three snapshots.
@@ -62,7 +64,7 @@
       await expectLater(
         find.byType(DiffPane),
         matchesDevToolsGolden(
-          '../../../goldens/memory_diff_three_snapshots1.png',
+          '../../../test_infra/goldens/memory_diff_three_snapshots1.png',
         ),
       );
       expect(snapshots.value.length, equals(1 + 3));
@@ -70,7 +72,7 @@
       await expectLater(
         find.byType(DiffPane),
         matchesDevToolsGolden(
-          '../../../goldens/memory_diff_selected_class.png',
+          '../../../test_infra/goldens/memory_diff_selected_class.png',
         ),
       );
 
@@ -85,7 +87,7 @@
       await expectLater(
         find.byType(DiffPane),
         matchesDevToolsGolden(
-          '../../../goldens/memory_diff_three_snapshots2.png',
+          '../../../test_infra/goldens/memory_diff_three_snapshots2.png',
         ),
       );
       expect(snapshots.value.length, equals(1 + 3 - 1 + 1));
@@ -95,7 +97,9 @@
       await tester.pumpAndSettle();
       await expectLater(
         find.byType(DiffPane),
-        matchesDevToolsGolden('../../../goldens/memory_diff_empty2.png'),
+        matchesDevToolsGolden(
+          '../../../test_infra/goldens/memory_diff_empty2.png',
+        ),
       );
       expect(snapshots.value.length, equals(1));
     });

packages/devtools_app/test/memory/leaks/diagnostics/leak_analyzer_test.dart

diff --git a/packages/devtools_app/test/memory/leaks/diagnostics/leak_analyzer_test.dart b/packages/devtools_app/test/memory/leaks/diagnostics/leak_analyzer_test.dart
index cb09441..5c76439 100644
--- a/packages/devtools_app/test/memory/leaks/diagnostics/leak_analyzer_test.dart
+++ b/packages/devtools_app/test/memory/leaks/diagnostics/leak_analyzer_test.dart
@@ -10,7 +10,7 @@
 import 'package:devtools_app/src/screens/memory/panes/leaks/instrumentation/model.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../../test_data/memory/leaks/leaks_data.dart';
+import '../../../test_infra/test_data/memory/leaks/leaks_data.dart';
 
 void main() {
   for (var t in goldenLeakTests) {

packages/devtools_app/test/memory/memory_screen_test.dart

diff --git a/packages/devtools_app/test/memory/memory_screen_test.dart b/packages/devtools_app/test/memory/memory_screen_test.dart
index 80a5916..51f29ed 100644
--- a/packages/devtools_app/test/memory/memory_screen_test.dart
+++ b/packages/devtools_app/test/memory/memory_screen_test.dart
@@ -22,9 +22,9 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 
-import '../test_data/memory.dart';
-import '../test_data/memory_allocation.dart';
 import '../test_infra/matchers.dart';
+import '../test_infra/test_data/memory.dart';
+import '../test_infra/test_data/memory_allocation.dart';
 
 void main() {
   late MemoryScreen screen;
@@ -192,7 +192,7 @@
 
       await expectLater(
         find.byType(MemoryVMChart),
-        matchesDevToolsGolden('../goldens/memory_hover_card.png'),
+        matchesDevToolsGolden('../test_infra/goldens/memory_hover_card.png'),
       );
     });
 

packages/devtools_app/test/memory/shared/heap/heap_analyzer_golden_test.dart

diff --git a/packages/devtools_app/test/memory/shared/heap/heap_analyzer_golden_test.dart b/packages/devtools_app/test/memory/shared/heap/heap_analyzer_golden_test.dart
index aa193c6..71ba2e8 100644
--- a/packages/devtools_app/test/memory/shared/heap/heap_analyzer_golden_test.dart
+++ b/packages/devtools_app/test/memory/shared/heap/heap_analyzer_golden_test.dart
@@ -6,7 +6,7 @@
 import 'package:devtools_app/src/screens/memory/shared/heap/spanning_tree.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../../test_data/memory/heap/heap_data.dart';
+import '../../../test_infra/test_data/memory/heap/heap_data.dart';
 
 void main() async {
   for (var t in goldenHeapTests) {

packages/devtools_app/test/network/network_model_test.dart

diff --git a/packages/devtools_app/test/network/network_model_test.dart b/packages/devtools_app/test/network/network_model_test.dart
index be23c10..70d6d22 100644
--- a/packages/devtools_app/test/network/network_model_test.dart
+++ b/packages/devtools_app/test/network/network_model_test.dart
@@ -12,7 +12,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../test_data/network.dart';
+import '../test_infra/test_data/network.dart';
 import 'utils/network_test_utils.dart';
 
 void main() {

packages/devtools_app/test/network/network_profiler_test.dart

diff --git a/packages/devtools_app/test/network/network_profiler_test.dart b/packages/devtools_app/test/network/network_profiler_test.dart
index 04a2997..c843611 100644
--- a/packages/devtools_app/test/network/network_profiler_test.dart
+++ b/packages/devtools_app/test/network/network_profiler_test.dart
@@ -25,7 +25,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../test_data/network.dart';
+import '../test_infra/test_data/network.dart';
 import 'utils/network_test_utils.dart';
 
 NetworkController controller = NetworkController();

packages/devtools_app/test/network/network_request_inspector_test.dart

diff --git a/packages/devtools_app/test/network/network_request_inspector_test.dart b/packages/devtools_app/test/network/network_request_inspector_test.dart
index 4ee95bc..328c727 100644
--- a/packages/devtools_app/test/network/network_request_inspector_test.dart
+++ b/packages/devtools_app/test/network/network_request_inspector_test.dart
@@ -15,7 +15,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../test_data/network.dart';
+import '../test_infra/test_data/network.dart';
 import '../test_infra/utils/test_utils.dart';
 
 void main() {

packages/devtools_app/test/network/network_table_test.dart

diff --git a/packages/devtools_app/test/network/network_table_test.dart b/packages/devtools_app/test/network/network_table_test.dart
index 19eecfb..96d3fee 100644
--- a/packages/devtools_app/test/network/network_table_test.dart
+++ b/packages/devtools_app/test/network/network_table_test.dart
@@ -15,7 +15,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../test_data/network.dart';
+import '../test_infra/test_data/network.dart';
 import 'utils/network_test_utils.dart';
 
 void main() {

packages/devtools_app/test/network/utils/network_test_utils.dart

diff --git a/packages/devtools_app/test/network/utils/network_test_utils.dart b/packages/devtools_app/test/network/utils/network_test_utils.dart
index 32fd205..33a2362 100644
--- a/packages/devtools_app/test/network/utils/network_test_utils.dart
+++ b/packages/devtools_app/test/network/utils/network_test_utils.dart
@@ -4,7 +4,7 @@
 
 import 'package:vm_service/vm_service.dart';
 
-import '../../test_data/network.dart';
+import '../../test_infra/test_data/network.dart';
 
 SocketProfile loadSocketProfile() {
   return SocketProfile(

packages/devtools_app/test/performance/flutter_frames/flutter_frame_model_test.dart

diff --git a/packages/devtools_app/test/performance/flutter_frames/flutter_frame_model_test.dart b/packages/devtools_app/test/performance/flutter_frames/flutter_frame_model_test.dart
index f74fd6e..e0f0ee1 100644
--- a/packages/devtools_app/test/performance/flutter_frames/flutter_frame_model_test.dart
+++ b/packages/devtools_app/test/performance/flutter_frames/flutter_frame_model_test.dart
@@ -5,7 +5,7 @@
 import 'package:devtools_app/devtools_app.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../test_data/performance.dart';
+import '../../test_infra/test_data/performance.dart';
 
 void main() {
   group('$FlutterFrame', () {

packages/devtools_app/test/performance/flutter_frames/flutter_frames_chart_test.dart

diff --git a/packages/devtools_app/test/performance/flutter_frames/flutter_frames_chart_test.dart b/packages/devtools_app/test/performance/flutter_frames/flutter_frames_chart_test.dart
index a299fa5..653fa2e 100644
--- a/packages/devtools_app/test/performance/flutter_frames/flutter_frames_chart_test.dart
+++ b/packages/devtools_app/test/performance/flutter_frames/flutter_frames_chart_test.dart
@@ -11,7 +11,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../test_data/performance.dart';
+import '../../test_infra/test_data/performance.dart';
 
 void main() {
   late FlutterFramesController framesController;

packages/devtools_app/test/performance/flutter_frames/flutter_frames_controller_test.dart

diff --git a/packages/devtools_app/test/performance/flutter_frames/flutter_frames_controller_test.dart b/packages/devtools_app/test/performance/flutter_frames/flutter_frames_controller_test.dart
index 60f70a6..0fa0614 100644
--- a/packages/devtools_app/test/performance/flutter_frames/flutter_frames_controller_test.dart
+++ b/packages/devtools_app/test/performance/flutter_frames/flutter_frames_controller_test.dart
@@ -8,7 +8,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 
-import '../../test_data/performance.dart';
+import '../../test_infra/test_data/performance.dart';
 
 // TODO(kenz): add better test coverage for [FlutterFramesController].
 void main() async {

packages/devtools_app/test/performance/frame_analysis/frame_analysis_model_test.dart

diff --git a/packages/devtools_app/test/performance/frame_analysis/frame_analysis_model_test.dart b/packages/devtools_app/test/performance/frame_analysis/frame_analysis_model_test.dart
index e3aa987..4b69dc9 100644
--- a/packages/devtools_app/test/performance/frame_analysis/frame_analysis_model_test.dart
+++ b/packages/devtools_app/test/performance/frame_analysis/frame_analysis_model_test.dart
@@ -5,7 +5,7 @@
 import 'package:devtools_app/devtools_app.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../test_data/performance.dart';
+import '../../test_infra/test_data/performance.dart';
 
 void main() {
   group('FrameAnalysis', () {

packages/devtools_app/test/performance/frame_analysis/frame_analysis_test.dart

diff --git a/packages/devtools_app/test/performance/frame_analysis/frame_analysis_test.dart b/packages/devtools_app/test/performance/frame_analysis/frame_analysis_test.dart
index babc86f..3269815 100644
--- a/packages/devtools_app/test/performance/frame_analysis/frame_analysis_test.dart
+++ b/packages/devtools_app/test/performance/frame_analysis/frame_analysis_test.dart
@@ -12,8 +12,8 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../test_data/performance.dart';
 import '../../test_infra/matchers.dart';
+import '../../test_infra/test_data/performance.dart';
 
 void main() {
   const windowSize = Size(4000.0, 1000.0);

packages/devtools_app/test/performance/frame_analysis/frame_hints_test.dart

diff --git a/packages/devtools_app/test/performance/frame_analysis/frame_hints_test.dart b/packages/devtools_app/test/performance/frame_analysis/frame_hints_test.dart
index 94877fe..2df3adf 100644
--- a/packages/devtools_app/test/performance/frame_analysis/frame_hints_test.dart
+++ b/packages/devtools_app/test/performance/frame_analysis/frame_hints_test.dart
@@ -11,7 +11,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 
-import '../../test_data/performance.dart';
+import '../../test_infra/test_data/performance.dart';
 
 void main() {
   const windowSize = Size(4000.0, 1000.0);

packages/devtools_app/test/performance/performance_model_test.dart

diff --git a/packages/devtools_app/test/performance/performance_model_test.dart b/packages/devtools_app/test/performance/performance_model_test.dart
index 3817b16..1108ead 100644
--- a/packages/devtools_app/test/performance/performance_model_test.dart
+++ b/packages/devtools_app/test/performance/performance_model_test.dart
@@ -9,9 +9,9 @@
 import 'package:devtools_app/src/screens/performance/panes/rebuild_stats/rebuild_counts.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../test_data/cpu_profile.dart';
-import '../test_data/performance.dart';
-import '../test_data/performance_raster_stats.dart';
+import '../test_infra/test_data/cpu_profile.dart';
+import '../test_infra/test_data/performance.dart';
+import '../test_infra/test_data/performance_raster_stats.dart';
 
 import '../test_infra/utils/test_utils.dart';
 

packages/devtools_app/test/performance/performance_screen_test.dart

diff --git a/packages/devtools_app/test/performance/performance_screen_test.dart b/packages/devtools_app/test/performance/performance_screen_test.dart
index 5748da9..20a7525 100644
--- a/packages/devtools_app/test/performance/performance_screen_test.dart
+++ b/packages/devtools_app/test/performance/performance_screen_test.dart
@@ -16,7 +16,7 @@
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart' as vm_service;
 
-import '../test_data/performance.dart';
+import '../test_infra/test_data/performance.dart';
 
 void main() {
   setGlobal(IdeTheme, IdeTheme());

packages/devtools_app/test/performance/performance_utils_test.dart

diff --git a/packages/devtools_app/test/performance/performance_utils_test.dart b/packages/devtools_app/test/performance/performance_utils_test.dart
index 296dccb..fc2c7bd 100644
--- a/packages/devtools_app/test/performance/performance_utils_test.dart
+++ b/packages/devtools_app/test/performance/performance_utils_test.dart
@@ -5,7 +5,7 @@
 import 'package:devtools_app/src/screens/performance/performance_utils.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../test_data/performance.dart';
+import '../test_infra/test_data/performance.dart';
 
 void main() {
   group('PerformanceUtils', () {

packages/devtools_app/test/performance/raster_stats/raster_stats_controller_test.dart

diff --git a/packages/devtools_app/test/performance/raster_stats/raster_stats_controller_test.dart b/packages/devtools_app/test/performance/raster_stats/raster_stats_controller_test.dart
index dc26283..6314b7b 100644
--- a/packages/devtools_app/test/performance/raster_stats/raster_stats_controller_test.dart
+++ b/packages/devtools_app/test/performance/raster_stats/raster_stats_controller_test.dart
@@ -9,7 +9,7 @@
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../../test_data/performance_raster_stats.dart';
+import '../../test_infra/test_data/performance_raster_stats.dart';
 
 void main() {
   group('$RasterStatsController', () {

packages/devtools_app/test/performance/raster_stats/raster_stats_model_test.dart

diff --git a/packages/devtools_app/test/performance/raster_stats/raster_stats_model_test.dart b/packages/devtools_app/test/performance/raster_stats/raster_stats_model_test.dart
index 32a4589..4b9cf5e 100644
--- a/packages/devtools_app/test/performance/raster_stats/raster_stats_model_test.dart
+++ b/packages/devtools_app/test/performance/raster_stats/raster_stats_model_test.dart
@@ -7,7 +7,7 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../../test_data/performance_raster_stats.dart';
+import '../../test_infra/test_data/performance_raster_stats.dart';
 
 void main() {
   late RasterStats rasterStats;

packages/devtools_app/test/performance/raster_stats/raster_stats_test.dart

diff --git a/packages/devtools_app/test/performance/raster_stats/raster_stats_test.dart b/packages/devtools_app/test/performance/raster_stats/raster_stats_test.dart
index bcc2633..0eb5669 100644
--- a/packages/devtools_app/test/performance/raster_stats/raster_stats_test.dart
+++ b/packages/devtools_app/test/performance/raster_stats/raster_stats_test.dart
@@ -9,8 +9,8 @@
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 
-import '../../test_data/performance_raster_stats.dart';
 import '../../test_infra/matchers.dart';
+import '../../test_infra/test_data/performance_raster_stats.dart';
 
 void main() {
   group('RenderingLayerVisualizer', () {

packages/devtools_app/test/performance/tabbed_performance_view_test.dart

diff --git a/packages/devtools_app/test/performance/tabbed_performance_view_test.dart b/packages/devtools_app/test/performance/tabbed_performance_view_test.dart
index b87f9a5..8404f93 100644
--- a/packages/devtools_app/test/performance/tabbed_performance_view_test.dart
+++ b/packages/devtools_app/test/performance/tabbed_performance_view_test.dart
@@ -16,7 +16,7 @@
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart' as vm_service;
 
-import '../test_data/performance.dart';
+import '../test_infra/test_data/performance.dart';
 
 void main() {
   late FakeServiceManager fakeServiceManager;

packages/devtools_app/test/performance/timeline_events/event_details_test.dart

diff --git a/packages/devtools_app/test/performance/timeline_events/event_details_test.dart b/packages/devtools_app/test/performance/timeline_events/event_details_test.dart
index 55a8180..7a7a977 100644
--- a/packages/devtools_app/test/performance/timeline_events/event_details_test.dart
+++ b/packages/devtools_app/test/performance/timeline_events/event_details_test.dart
@@ -12,7 +12,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 
-import '../../test_data/performance.dart';
+import '../../test_infra/test_data/performance.dart';
 
 void main() {
   const windowSize = Size(2000.0, 1000.0);

packages/devtools_app/test/performance/timeline_events/timeline_events_controller_test.dart

diff --git a/packages/devtools_app/test/performance/timeline_events/timeline_events_controller_test.dart b/packages/devtools_app/test/performance/timeline_events/timeline_events_controller_test.dart
index 241efcd..fbf6bc3 100644
--- a/packages/devtools_app/test/performance/timeline_events/timeline_events_controller_test.dart
+++ b/packages/devtools_app/test/performance/timeline_events/timeline_events_controller_test.dart
@@ -11,7 +11,7 @@
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart' hide TimelineEvent;
 
-import '../../test_data/performance.dart';
+import '../../test_infra/test_data/performance.dart';
 
 // TODO(kenz): add better test coverage for [TimelineEventsController].
 
@@ -61,7 +61,8 @@
       offlineController.enterOfflineMode();
       final traceEvents = [...goldenUiTraceEvents, ...goldenRasterTraceEvents]
           .map((e) => e.json)
-          .toList();
+          .toList()
+          .cast<Map<String, dynamic>>();
       // TODO(kenz): add some frames for these timeline events to the offline
       // data and verify we correctly assign the events to their frames.
       final offlineData = PerformanceData(traceEvents: traceEvents);

packages/devtools_app/test/performance/timeline_events/timeline_flame_chart_test.dart

diff --git a/packages/devtools_app/test/performance/timeline_events/timeline_flame_chart_test.dart b/packages/devtools_app/test/performance/timeline_events/timeline_flame_chart_test.dart
index 1792d11..147948a 100644
--- a/packages/devtools_app/test/performance/timeline_events/timeline_flame_chart_test.dart
+++ b/packages/devtools_app/test/performance/timeline_events/timeline_flame_chart_test.dart
@@ -17,8 +17,8 @@
 import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart' as vm_service;
 
-import '../../test_data/performance.dart';
 import '../../test_infra/matchers.dart';
+import '../../test_infra/test_data/performance.dart';
 
 void main() {
   FakeServiceManager fakeServiceManager;
@@ -172,7 +172,7 @@
         await expectLater(
           find.byType(TimelineFlameChart),
           matchesDevToolsGolden(
-            '../../goldens/timeline_flame_chart_with_selected_frame.png',
+            '../../test_infra/goldens/timeline_flame_chart_with_selected_frame.png',
           ),
         );
         // Await delay for golden comparison.

packages/devtools_app/test/performance/timeline_events/timeline_processor_test.dart

diff --git a/packages/devtools_app/test/performance/timeline_events/timeline_processor_test.dart b/packages/devtools_app/test/performance/timeline_events/timeline_processor_test.dart
index f31e95a..7cf05ff 100644
--- a/packages/devtools_app/test/performance/timeline_events/timeline_processor_test.dart
+++ b/packages/devtools_app/test/performance/timeline_events/timeline_processor_test.dart
@@ -9,7 +9,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:mockito/mockito.dart';
 
-import '../../test_data/performance.dart';
+import '../../test_infra/test_data/performance.dart';
 import '../../test_infra/utils/test_utils.dart';
 
 void main() {
@@ -161,7 +161,7 @@
     });
 
     test('processes all events', () async {
-      final traceEvents = [
+      final traceEvents = <TraceEventWrapper>[
         ...asyncTraceEvents,
         ...goldenUiTraceEvents,
         ...goldenRasterTraceEvents,
@@ -197,7 +197,7 @@
     });
 
     test('tracks flutter frame identifier events', () async {
-      final traceEvents = [
+      final traceEvents = <TraceEventWrapper>[
         ...goldenUiTraceEvents,
         ...goldenRasterTraceEvents,
       ]..sort();

packages/devtools_app/test/provider/provider_screen_test.dart

diff --git a/packages/devtools_app/test/provider/provider_screen_test.dart b/packages/devtools_app/test/provider/provider_screen_test.dart
index 7f5184e..8a5e634 100644
--- a/packages/devtools_app/test/provider/provider_screen_test.dart
+++ b/packages/devtools_app/test/provider/provider_screen_test.dart
@@ -82,7 +82,7 @@
       await expectLater(
         find.byType(ProviderScreenBody),
         matchesDevToolsGolden(
-          '../goldens/provider_screen/list_error_banner.png',
+          '../test_infra/goldens/provider_screen/list_error_banner.png',
         ),
       );
     });
@@ -311,7 +311,7 @@
       await expectLater(
         find.byType(ProviderScreenBody),
         matchesDevToolsGolden(
-          '../goldens/provider_screen/no_selected_provider.png',
+          '../test_infra/goldens/provider_screen/no_selected_provider.png',
         ),
       );
 
@@ -347,7 +347,7 @@
       await expectLater(
         find.byType(ProviderScreenBody),
         matchesDevToolsGolden(
-          '../goldens/provider_screen/selected_provider.png',
+          '../test_infra/goldens/provider_screen/selected_provider.png',
         ),
       );
     });
@@ -400,7 +400,7 @@
       await expectLater(
         find.byType(ProviderScreenBody),
         matchesDevToolsGolden(
-          '../goldens/provider_screen/selected_provider_error_banner.png',
+          '../test_infra/goldens/provider_screen/selected_provider_error_banner.png',
         ),
       );
     });

packages/devtools_app/test/shared/flame_chart_test.dart

diff --git a/packages/devtools_app/test/shared/flame_chart_test.dart b/packages/devtools_app/test/shared/flame_chart_test.dart
index f13114a..5ad5df6 100644
--- a/packages/devtools_app/test/shared/flame_chart_test.dart
+++ b/packages/devtools_app/test/shared/flame_chart_test.dart
@@ -17,8 +17,8 @@
 import 'package:flutter/services.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../test_data/cpu_profile.dart';
-import '../test_data/performance.dart';
+import '../test_infra/test_data/cpu_profile.dart';
+import '../test_infra/test_data/performance.dart';
 
 void main() {
   const defaultZoom = 1.0;

packages/devtools_app/test/shared/instance_viewer_test.dart

diff --git a/packages/devtools_app/test/shared/instance_viewer_test.dart b/packages/devtools_app/test/shared/instance_viewer_test.dart
index 15dce0c..c257b12 100644
--- a/packages/devtools_app/test/shared/instance_viewer_test.dart
+++ b/packages/devtools_app/test/shared/instance_viewer_test.dart
@@ -219,7 +219,7 @@
       await expectLater(
         find.byType(MaterialApp),
         matchesDevToolsGolden(
-          '../goldens/instance_viewer/show_internal_properties.png',
+          '../test_infra/goldens/instance_viewer/show_internal_properties.png',
         ),
       );
     });
@@ -288,7 +288,7 @@
 
       await expectLater(
         find.byType(MaterialApp),
-        matchesDevToolsGolden('../goldens/instance_viewer/edit.png'),
+        matchesDevToolsGolden('../test_infra/goldens/instance_viewer/edit.png'),
       );
 
       // can press esc to unfocus active node
@@ -298,7 +298,9 @@
 
       await expectLater(
         find.byType(MaterialApp),
-        matchesDevToolsGolden('../goldens/instance_viewer/edit_esc.png'),
+        matchesDevToolsGolden(
+          '../test_infra/goldens/instance_viewer/edit_esc.png',
+        ),
       );
     });
 
@@ -325,7 +327,9 @@
 
       await expectLater(
         find.byType(MaterialApp),
-        matchesDevToolsGolden('../goldens/instance_viewer/loading.png'),
+        matchesDevToolsGolden(
+          '../test_infra/goldens/instance_viewer/loading.png',
+        ),
       );
     });
 
@@ -367,7 +371,7 @@
 
       await expectLater(
         find.byType(MaterialApp),
-        matchesDevToolsGolden('../goldens/instance_viewer/null.png'),
+        matchesDevToolsGolden('../test_infra/goldens/instance_viewer/null.png'),
       );
 
       await tester.pumpWidget(
@@ -383,7 +387,9 @@
 
       await expectLater(
         find.byType(MaterialApp),
-        matchesDevToolsGolden('../goldens/instance_viewer/error.png'),
+        matchesDevToolsGolden(
+          '../test_infra/goldens/instance_viewer/error.png',
+        ),
       );
     });
 
@@ -422,7 +428,7 @@
 
       await expectLater(
         find.byType(MaterialApp),
-        matchesDevToolsGolden('../goldens/instance_viewer/null.png'),
+        matchesDevToolsGolden('../test_infra/goldens/instance_viewer/null.png'),
       );
 
       await tester.pumpWidget(
@@ -438,7 +444,7 @@
 
       await expectLater(
         find.byType(MaterialApp),
-        matchesDevToolsGolden('../goldens/instance_viewer/num.png'),
+        matchesDevToolsGolden('../test_infra/goldens/instance_viewer/num.png'),
       );
     });
 
@@ -469,7 +475,7 @@
 
       await expectLater(
         find.byType(MaterialApp),
-        matchesDevToolsGolden('../goldens/instance_viewer/enum.png'),
+        matchesDevToolsGolden('../test_infra/goldens/instance_viewer/enum.png'),
       );
     });
 
@@ -500,7 +506,7 @@
 
       await expectLater(
         find.byType(MaterialApp),
-        matchesDevToolsGolden('../goldens/instance_viewer/null.png'),
+        matchesDevToolsGolden('../test_infra/goldens/instance_viewer/null.png'),
       );
     });
 
@@ -531,7 +537,7 @@
 
       await expectLater(
         find.byType(MaterialApp),
-        matchesDevToolsGolden('../goldens/instance_viewer/bool.png'),
+        matchesDevToolsGolden('../test_infra/goldens/instance_viewer/bool.png'),
       );
     });
 
@@ -562,7 +568,9 @@
 
       await expectLater(
         find.byType(MaterialApp),
-        matchesDevToolsGolden('../goldens/instance_viewer/string.png'),
+        matchesDevToolsGolden(
+          '../test_infra/goldens/instance_viewer/string.png',
+        ),
       );
     });
 
@@ -593,7 +601,7 @@
 
       await expectLater(
         find.byType(MaterialApp),
-        matchesDevToolsGolden('../goldens/instance_viewer/num.png'),
+        matchesDevToolsGolden('../test_infra/goldens/instance_viewer/num.png'),
       );
     });
 
@@ -655,7 +663,9 @@
 
       await expectLater(
         find.byType(MaterialApp),
-        matchesDevToolsGolden('../goldens/instance_viewer/collasped_map.png'),
+        matchesDevToolsGolden(
+          '../test_infra/goldens/instance_viewer/collasped_map.png',
+        ),
       );
 
       container
@@ -673,7 +683,9 @@
 
       await expectLater(
         find.byType(MaterialApp),
-        matchesDevToolsGolden('../goldens/instance_viewer/expanded_map.png'),
+        matchesDevToolsGolden(
+          '../test_infra/goldens/instance_viewer/expanded_map.png',
+        ),
       );
     });
 
@@ -756,7 +768,7 @@
       await expectLater(
         find.byType(MaterialApp),
         matchesDevToolsGolden(
-          '../goldens/instance_viewer/collasped_object.png',
+          '../test_infra/goldens/instance_viewer/collasped_object.png',
         ),
       );
 
@@ -781,7 +793,9 @@
 
       await expectLater(
         find.byType(MaterialApp),
-        matchesDevToolsGolden('../goldens/instance_viewer/expanded_object.png'),
+        matchesDevToolsGolden(
+          '../test_infra/goldens/instance_viewer/expanded_object.png',
+        ),
       );
     });
 
@@ -847,7 +861,9 @@
 
       await expectLater(
         find.byType(MaterialApp),
-        matchesDevToolsGolden('../goldens/instance_viewer/collasped_list.png'),
+        matchesDevToolsGolden(
+          '../test_infra/goldens/instance_viewer/collasped_list.png',
+        ),
       );
 
       container
@@ -865,7 +881,9 @@
 
       await expectLater(
         find.byType(MaterialApp),
-        matchesDevToolsGolden('../goldens/instance_viewer/expanded_list.png'),
+        matchesDevToolsGolden(
+          '../test_infra/goldens/instance_viewer/expanded_list.png',
+        ),
       );
     });
 

packages/devtools_app/test/shared/span_parser_test.dart

diff --git a/packages/devtools_app/test/shared/span_parser_test.dart b/packages/devtools_app/test/shared/span_parser_test.dart
index 4eafa0f..5b6a609 100644
--- a/packages/devtools_app/test/shared/span_parser_test.dart
+++ b/packages/devtools_app/test/shared/span_parser_test.dart
@@ -30,10 +30,12 @@
   final grammarFile = File(path.join('assets', 'dart_syntax.json')).absolute;
   late Grammar grammar;
 
-  final Directory testDataDirectory =
-      Directory(path.join('test', 'test_data', 'syntax_highlighting')).absolute;
-  final Directory goldenDirectory =
-      Directory(path.join('test', 'goldens', 'syntax_highlighting')).absolute;
+  final Directory testDataDirectory = Directory(
+    path.join('test', 'test_infra', 'test_data', 'syntax_highlighting'),
+  ).absolute;
+  final Directory goldenDirectory = Directory(
+    path.join('test', 'test_infra', 'goldens', 'syntax_highlighting'),
+  ).absolute;
 
   setUpAll(() async {
     expect(grammarFile.existsSync(), true);

packages/devtools_app/test/shared/treemap_test.dart

diff --git a/packages/devtools_app/test/shared/treemap_test.dart b/packages/devtools_app/test/shared/treemap_test.dart
index 1930ec9..1c42f4e 100644
--- a/packages/devtools_app/test/shared/treemap_test.dart
+++ b/packages/devtools_app/test/shared/treemap_test.dart
@@ -11,11 +11,11 @@
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
-import '../test_data/app_size/apk_analysis.dart';
-import '../test_data/app_size/new_v8.dart';
-import '../test_data/app_size/sizes.dart';
-import '../test_data/app_size/small_sizes.dart';
 import '../test_infra/matchers.dart';
+import '../test_infra/test_data/app_size/apk_analysis.dart';
+import '../test_infra/test_data/app_size/new_v8.dart';
+import '../test_infra/test_data/app_size/sizes.dart';
+import '../test_infra/test_data/app_size/small_sizes.dart';
 
 void main() {
   TreemapNode? root;
@@ -182,7 +182,7 @@
 
         await expectLater(
           find.byKey(treemapKey),
-          matchesDevToolsGolden('../goldens/treemap_sizes.png'),
+          matchesDevToolsGolden('../test_infra/goldens/treemap_sizes.png'),
         );
       },
       // ignore: avoid_redundant_argument_values
@@ -206,7 +206,7 @@
 
         await expectLater(
           find.byKey(treemapKey),
-          matchesDevToolsGolden('../goldens/treemap_v8.png'),
+          matchesDevToolsGolden('../test_infra/goldens/treemap_v8.png'),
         );
         // Await delay for golden comparison.
         await tester.pumpAndSettle(const Duration(seconds: 2));
@@ -232,7 +232,7 @@
 
         await expectLater(
           find.byKey(treemapKey),
-          matchesDevToolsGolden('../goldens/treemap_apk.png'),
+          matchesDevToolsGolden('../test_infra/goldens/treemap_apk.png'),
         );
         // Await delay for golden comparison.
         await tester.pumpAndSettle(const Duration(seconds: 2));

packages/devtools_app/test/shared/ui_utils_test.dart

diff --git a/packages/devtools_app/test/shared/ui_utils_test.dart b/packages/devtools_app/test/shared/ui_utils_test.dart
index 7e1b2bd..0dc847a 100644
--- a/packages/devtools_app/test/shared/ui_utils_test.dart
+++ b/packages/devtools_app/test/shared/ui_utils_test.dart
@@ -263,7 +263,9 @@
     // Screenshot should show both vertical and horizontal scrollbars.
     await expectLater(
       find.byKey(root),
-      matchesDevToolsGolden('../goldens/offset_scrollbar_startup.png'),
+      matchesDevToolsGolden(
+        '../test_infra/goldens/offset_scrollbar_startup.png',
+      ),
     );
 
     _scrollControllerX.jumpTo(500);
@@ -272,7 +274,9 @@
     // scrollbar is at its initial offset.
     await expectLater(
       find.byKey(root),
-      matchesDevToolsGolden('../goldens/offset_scrollbar_scrolled.png'),
+      matchesDevToolsGolden(
+        '../test_infra/goldens/offset_scrollbar_scrolled.png',
+      ),
     );
   });
 }

packages/devtools_app/test/test_infra/goldens/allocation_dropdown_hilight_line_1_golden.png

diff --git a/packages/devtools_app/test/goldens/allocation_dropdown_hilight_line_1_golden.png b/packages/devtools_app/test/test_infra/goldens/allocation_dropdown_hilight_line_1_golden.png
similarity index 100%
rename from packages/devtools_app/test/goldens/allocation_dropdown_hilight_line_1_golden.png
rename to packages/devtools_app/test/test_infra/goldens/allocation_dropdown_hilight_line_1_golden.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/allocation_dropdown_hilight_line_2_golden.png

diff --git a/packages/devtools_app/test/goldens/allocation_dropdown_hilight_line_2_golden.png b/packages/devtools_app/test/test_infra/goldens/allocation_dropdown_hilight_line_2_golden.png
similarity index 100%
rename from packages/devtools_app/test/goldens/allocation_dropdown_hilight_line_2_golden.png
rename to packages/devtools_app/test/test_infra/goldens/allocation_dropdown_hilight_line_2_golden.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/allocation_dropdown_hilight_line_3_golden.png

diff --git a/packages/devtools_app/test/goldens/allocation_dropdown_hilight_line_3_golden.png b/packages/devtools_app/test/test_infra/goldens/allocation_dropdown_hilight_line_3_golden.png
similarity index 100%
rename from packages/devtools_app/test/goldens/allocation_dropdown_hilight_line_3_golden.png
rename to packages/devtools_app/test/test_infra/goldens/allocation_dropdown_hilight_line_3_golden.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/allocation_dropdown_hilight_line_4_golden.png

diff --git a/packages/devtools_app/test/goldens/allocation_dropdown_hilight_line_4_golden.png b/packages/devtools_app/test/test_infra/goldens/allocation_dropdown_hilight_line_4_golden.png
similarity index 100%
rename from packages/devtools_app/test/goldens/allocation_dropdown_hilight_line_4_golden.png
rename to packages/devtools_app/test/test_infra/goldens/allocation_dropdown_hilight_line_4_golden.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/allocation_golden.png

diff --git a/packages/devtools_app/test/goldens/allocation_golden.png b/packages/devtools_app/test/test_infra/goldens/allocation_golden.png
similarity index 100%
rename from packages/devtools_app/test/goldens/allocation_golden.png
rename to packages/devtools_app/test/test_infra/goldens/allocation_golden.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/allocation_one_track_golden.png

diff --git a/packages/devtools_app/test/goldens/allocation_one_track_golden.png b/packages/devtools_app/test/test_infra/goldens/allocation_one_track_golden.png
similarity index 100%
rename from packages/devtools_app/test/goldens/allocation_one_track_golden.png
rename to packages/devtools_app/test/test_infra/goldens/allocation_one_track_golden.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/allocation_two_track_golden.png

diff --git a/packages/devtools_app/test/goldens/allocation_two_track_golden.png b/packages/devtools_app/test/test_infra/goldens/allocation_two_track_golden.png
similarity index 100%
rename from packages/devtools_app/test/goldens/allocation_two_track_golden.png
rename to packages/devtools_app/test/test_infra/goldens/allocation_two_track_golden.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/codeview_scrollbars.png

diff --git a/packages/devtools_app/test/goldens/codeview_scrollbars.png b/packages/devtools_app/test/test_infra/goldens/codeview_scrollbars.png
similarity index 100%
rename from packages/devtools_app/test/goldens/codeview_scrollbars.png
rename to packages/devtools_app/test/test_infra/goldens/codeview_scrollbars.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/cpu_profiler_bottom_up_guidelines.png

diff --git a/packages/devtools_app/test/goldens/cpu_profiler_bottom_up_guidelines.png b/packages/devtools_app/test/test_infra/goldens/cpu_profiler_bottom_up_guidelines.png
similarity index 100%
rename from packages/devtools_app/test/goldens/cpu_profiler_bottom_up_guidelines.png
rename to packages/devtools_app/test/test_infra/goldens/cpu_profiler_bottom_up_guidelines.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/cpu_profiler_bottom_up_no_guidelines.png

diff --git a/packages/devtools_app/test/goldens/cpu_profiler_bottom_up_no_guidelines.png b/packages/devtools_app/test/test_infra/goldens/cpu_profiler_bottom_up_no_guidelines.png
similarity index 100%
rename from packages/devtools_app/test/goldens/cpu_profiler_bottom_up_no_guidelines.png
rename to packages/devtools_app/test/test_infra/goldens/cpu_profiler_bottom_up_no_guidelines.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/cpu_profiler_call_tree_guidelines.png

diff --git a/packages/devtools_app/test/goldens/cpu_profiler_call_tree_guidelines.png b/packages/devtools_app/test/test_infra/goldens/cpu_profiler_call_tree_guidelines.png
similarity index 100%
rename from packages/devtools_app/test/goldens/cpu_profiler_call_tree_guidelines.png
rename to packages/devtools_app/test/test_infra/goldens/cpu_profiler_call_tree_guidelines.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/cpu_profiler_call_tree_no_guidelines.png

diff --git a/packages/devtools_app/test/goldens/cpu_profiler_call_tree_no_guidelines.png b/packages/devtools_app/test/test_infra/goldens/cpu_profiler_call_tree_no_guidelines.png
similarity index 100%
rename from packages/devtools_app/test/goldens/cpu_profiler_call_tree_no_guidelines.png
rename to packages/devtools_app/test/test_infra/goldens/cpu_profiler_call_tree_no_guidelines.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/inspector_controller_details_tree_scaffold.txt

diff --git a/packages/devtools_app/test/goldens/inspector_controller_details_tree_scaffold.txt b/packages/devtools_app/test/test_infra/goldens/inspector_controller_details_tree_scaffold.txt
similarity index 100%
rename from packages/devtools_app/test/goldens/inspector_controller_details_tree_scaffold.txt
rename to packages/devtools_app/test/test_infra/goldens/inspector_controller_details_tree_scaffold.txt

packages/devtools_app/test/test_infra/goldens/inspector_controller_details_tree_scaffold_expanded.txt

diff --git a/packages/devtools_app/test/goldens/inspector_controller_details_tree_scaffold_expanded.txt b/packages/devtools_app/test/test_infra/goldens/inspector_controller_details_tree_scaffold_expanded.txt
similarity index 100%
rename from packages/devtools_app/test/goldens/inspector_controller_details_tree_scaffold_expanded.txt
rename to packages/devtools_app/test/test_infra/goldens/inspector_controller_details_tree_scaffold_expanded.txt

packages/devtools_app/test/test_infra/goldens/inspector_controller_details_tree_scaffold_with_styles.txt

diff --git a/packages/devtools_app/test/goldens/inspector_controller_details_tree_scaffold_with_styles.txt b/packages/devtools_app/test/test_infra/goldens/inspector_controller_details_tree_scaffold_with_styles.txt
similarity index 100%
rename from packages/devtools_app/test/goldens/inspector_controller_details_tree_scaffold_with_styles.txt
rename to packages/devtools_app/test/test_infra/goldens/inspector_controller_details_tree_scaffold_with_styles.txt

packages/devtools_app/test/test_infra/goldens/inspector_controller_details_tree_scrolled_to_center.txt

diff --git a/packages/devtools_app/test/goldens/inspector_controller_details_tree_scrolled_to_center.txt b/packages/devtools_app/test/test_infra/goldens/inspector_controller_details_tree_scrolled_to_center.txt
similarity index 100%
rename from packages/devtools_app/test/goldens/inspector_controller_details_tree_scrolled_to_center.txt
rename to packages/devtools_app/test/test_infra/goldens/inspector_controller_details_tree_scrolled_to_center.txt

packages/devtools_app/test/test_infra/goldens/inspector_controller_initial_tree_with_styles.txt

diff --git a/packages/devtools_app/test/goldens/inspector_controller_initial_tree_with_styles.txt b/packages/devtools_app/test/test_infra/goldens/inspector_controller_initial_tree_with_styles.txt
similarity index 100%
rename from packages/devtools_app/test/goldens/inspector_controller_initial_tree_with_styles.txt
rename to packages/devtools_app/test/test_infra/goldens/inspector_controller_initial_tree_with_styles.txt

packages/devtools_app/test/test_infra/goldens/inspector_controller_selection_with_styles.txt

diff --git a/packages/devtools_app/test/goldens/inspector_controller_selection_with_styles.txt b/packages/devtools_app/test/test_infra/goldens/inspector_controller_selection_with_styles.txt
similarity index 100%
rename from packages/devtools_app/test/goldens/inspector_controller_selection_with_styles.txt
rename to packages/devtools_app/test/test_infra/goldens/inspector_controller_selection_with_styles.txt

packages/devtools_app/test/test_infra/goldens/inspector_controller_text_details_tree.txt

diff --git a/packages/devtools_app/test/goldens/inspector_controller_text_details_tree.txt b/packages/devtools_app/test/test_infra/goldens/inspector_controller_text_details_tree.txt
similarity index 100%
rename from packages/devtools_app/test/goldens/inspector_controller_text_details_tree.txt
rename to packages/devtools_app/test/test_infra/goldens/inspector_controller_text_details_tree.txt

packages/devtools_app/test/test_infra/goldens/inspector_controller_text_details_tree_richtext_selected.txt

diff --git a/packages/devtools_app/test/goldens/inspector_controller_text_details_tree_richtext_selected.txt b/packages/devtools_app/test/test_infra/goldens/inspector_controller_text_details_tree_richtext_selected.txt
similarity index 100%
rename from packages/devtools_app/test/goldens/inspector_controller_text_details_tree_richtext_selected.txt
rename to packages/devtools_app/test/test_infra/goldens/inspector_controller_text_details_tree_richtext_selected.txt

packages/devtools_app/test/test_infra/goldens/inspector_controller_text_details_tree_with_styles.txt

diff --git a/packages/devtools_app/test/goldens/inspector_controller_text_details_tree_with_styles.txt b/packages/devtools_app/test/test_infra/goldens/inspector_controller_text_details_tree_with_styles.txt
similarity index 100%
rename from packages/devtools_app/test/goldens/inspector_controller_text_details_tree_with_styles.txt
rename to packages/devtools_app/test/test_infra/goldens/inspector_controller_text_details_tree_with_styles.txt

packages/devtools_app/test/test_infra/goldens/inspector_service_details_tree.txt

diff --git a/packages/devtools_app/test/goldens/inspector_service_details_tree.txt b/packages/devtools_app/test/test_infra/goldens/inspector_service_details_tree.txt
similarity index 100%
rename from packages/devtools_app/test/goldens/inspector_service_details_tree.txt
rename to packages/devtools_app/test/test_infra/goldens/inspector_service_details_tree.txt

packages/devtools_app/test/test_infra/goldens/inspector_service_text_details_tree.txt

diff --git a/packages/devtools_app/test/goldens/inspector_service_text_details_tree.txt b/packages/devtools_app/test/test_infra/goldens/inspector_service_text_details_tree.txt
similarity index 100%
rename from packages/devtools_app/test/goldens/inspector_service_text_details_tree.txt
rename to packages/devtools_app/test/test_infra/goldens/inspector_service_text_details_tree.txt

packages/devtools_app/test/test_infra/goldens/inspector_service_text_details_tree_v2.txt

diff --git a/packages/devtools_app/test/goldens/inspector_service_text_details_tree_v2.txt b/packages/devtools_app/test/test_infra/goldens/inspector_service_text_details_tree_v2.txt
similarity index 100%
rename from packages/devtools_app/test/goldens/inspector_service_text_details_tree_v2.txt
rename to packages/devtools_app/test/test_infra/goldens/inspector_service_text_details_tree_v2.txt

packages/devtools_app/test/test_infra/goldens/inspector_service_text_details_tree_v3.txt

diff --git a/packages/devtools_app/test/goldens/inspector_service_text_details_tree_v3.txt b/packages/devtools_app/test/test_infra/goldens/inspector_service_text_details_tree_v3.txt
similarity index 100%
rename from packages/devtools_app/test/goldens/inspector_service_text_details_tree_v3.txt
rename to packages/devtools_app/test/test_infra/goldens/inspector_service_text_details_tree_v3.txt

packages/devtools_app/test/test_infra/goldens/inspector_service_text_details_tree_v4.txt

diff --git a/packages/devtools_app/test/goldens/inspector_service_text_details_tree_v4.txt b/packages/devtools_app/test/test_infra/goldens/inspector_service_text_details_tree_v4.txt
similarity index 100%
rename from packages/devtools_app/test/goldens/inspector_service_text_details_tree_v4.txt
rename to packages/devtools_app/test/test_infra/goldens/inspector_service_text_details_tree_v4.txt

packages/devtools_app/test/test_infra/goldens/instance_viewer/bool.png

diff --git a/packages/devtools_app/test/goldens/instance_viewer/bool.png b/packages/devtools_app/test/test_infra/goldens/instance_viewer/bool.png
similarity index 100%
rename from packages/devtools_app/test/goldens/instance_viewer/bool.png
rename to packages/devtools_app/test/test_infra/goldens/instance_viewer/bool.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/instance_viewer/collasped_list.png

diff --git a/packages/devtools_app/test/goldens/instance_viewer/collasped_list.png b/packages/devtools_app/test/test_infra/goldens/instance_viewer/collasped_list.png
similarity index 100%
rename from packages/devtools_app/test/goldens/instance_viewer/collasped_list.png
rename to packages/devtools_app/test/test_infra/goldens/instance_viewer/collasped_list.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/instance_viewer/collasped_map.png

diff --git a/packages/devtools_app/test/goldens/instance_viewer/collasped_map.png b/packages/devtools_app/test/test_infra/goldens/instance_viewer/collasped_map.png
similarity index 100%
rename from packages/devtools_app/test/goldens/instance_viewer/collasped_map.png
rename to packages/devtools_app/test/test_infra/goldens/instance_viewer/collasped_map.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/instance_viewer/collasped_object.png

diff --git a/packages/devtools_app/test/goldens/instance_viewer/collasped_object.png b/packages/devtools_app/test/test_infra/goldens/instance_viewer/collasped_object.png
similarity index 100%
rename from packages/devtools_app/test/goldens/instance_viewer/collasped_object.png
rename to packages/devtools_app/test/test_infra/goldens/instance_viewer/collasped_object.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/instance_viewer/edit.png

diff --git a/packages/devtools_app/test/goldens/instance_viewer/edit.png b/packages/devtools_app/test/test_infra/goldens/instance_viewer/edit.png
similarity index 100%
rename from packages/devtools_app/test/goldens/instance_viewer/edit.png
rename to packages/devtools_app/test/test_infra/goldens/instance_viewer/edit.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/instance_viewer/edit_esc.png

diff --git a/packages/devtools_app/test/goldens/instance_viewer/edit_esc.png b/packages/devtools_app/test/test_infra/goldens/instance_viewer/edit_esc.png
similarity index 100%
rename from packages/devtools_app/test/goldens/instance_viewer/edit_esc.png
rename to packages/devtools_app/test/test_infra/goldens/instance_viewer/edit_esc.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/instance_viewer/enum.png

diff --git a/packages/devtools_app/test/goldens/instance_viewer/enum.png b/packages/devtools_app/test/test_infra/goldens/instance_viewer/enum.png
similarity index 100%
rename from packages/devtools_app/test/goldens/instance_viewer/enum.png
rename to packages/devtools_app/test/test_infra/goldens/instance_viewer/enum.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/instance_viewer/error.png

diff --git a/packages/devtools_app/test/goldens/instance_viewer/error.png b/packages/devtools_app/test/test_infra/goldens/instance_viewer/error.png
similarity index 100%
rename from packages/devtools_app/test/goldens/instance_viewer/error.png
rename to packages/devtools_app/test/test_infra/goldens/instance_viewer/error.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/instance_viewer/expanded_list.png

diff --git a/packages/devtools_app/test/goldens/instance_viewer/expanded_list.png b/packages/devtools_app/test/test_infra/goldens/instance_viewer/expanded_list.png
similarity index 100%
rename from packages/devtools_app/test/goldens/instance_viewer/expanded_list.png
rename to packages/devtools_app/test/test_infra/goldens/instance_viewer/expanded_list.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/instance_viewer/expanded_map.png

diff --git a/packages/devtools_app/test/goldens/instance_viewer/expanded_map.png b/packages/devtools_app/test/test_infra/goldens/instance_viewer/expanded_map.png
similarity index 100%
rename from packages/devtools_app/test/goldens/instance_viewer/expanded_map.png
rename to packages/devtools_app/test/test_infra/goldens/instance_viewer/expanded_map.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/instance_viewer/expanded_object.png

diff --git a/packages/devtools_app/test/goldens/instance_viewer/expanded_object.png b/packages/devtools_app/test/test_infra/goldens/instance_viewer/expanded_object.png
similarity index 100%
rename from packages/devtools_app/test/goldens/instance_viewer/expanded_object.png
rename to packages/devtools_app/test/test_infra/goldens/instance_viewer/expanded_object.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/instance_viewer/loading.png

diff --git a/packages/devtools_app/test/goldens/instance_viewer/loading.png b/packages/devtools_app/test/test_infra/goldens/instance_viewer/loading.png
similarity index 100%
rename from packages/devtools_app/test/goldens/instance_viewer/loading.png
rename to packages/devtools_app/test/test_infra/goldens/instance_viewer/loading.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/instance_viewer/null.png

diff --git a/packages/devtools_app/test/goldens/instance_viewer/null.png b/packages/devtools_app/test/test_infra/goldens/instance_viewer/null.png
similarity index 100%
rename from packages/devtools_app/test/goldens/instance_viewer/null.png
rename to packages/devtools_app/test/test_infra/goldens/instance_viewer/null.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/instance_viewer/num.png

diff --git a/packages/devtools_app/test/goldens/instance_viewer/num.png b/packages/devtools_app/test/test_infra/goldens/instance_viewer/num.png
similarity index 100%
rename from packages/devtools_app/test/goldens/instance_viewer/num.png
rename to packages/devtools_app/test/test_infra/goldens/instance_viewer/num.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/instance_viewer/show_internal_properties.png

diff --git a/packages/devtools_app/test/goldens/instance_viewer/show_internal_properties.png b/packages/devtools_app/test/test_infra/goldens/instance_viewer/show_internal_properties.png
similarity index 100%
rename from packages/devtools_app/test/goldens/instance_viewer/show_internal_properties.png
rename to packages/devtools_app/test/test_infra/goldens/instance_viewer/show_internal_properties.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/instance_viewer/string.png

diff --git a/packages/devtools_app/test/goldens/instance_viewer/string.png b/packages/devtools_app/test/test_infra/goldens/instance_viewer/string.png
similarity index 100%
rename from packages/devtools_app/test/goldens/instance_viewer/string.png
rename to packages/devtools_app/test/test_infra/goldens/instance_viewer/string.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/integration_animated_physical_model_selected.png

diff --git a/packages/devtools_app/test/goldens/integration_animated_physical_model_selected.png b/packages/devtools_app/test/test_infra/goldens/integration_animated_physical_model_selected.png
similarity index 100%
rename from packages/devtools_app/test/goldens/integration_animated_physical_model_selected.png
rename to packages/devtools_app/test/test_infra/goldens/integration_animated_physical_model_selected.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/integration_inspector_errors_1_initial_load.png

diff --git a/packages/devtools_app/test/goldens/integration_inspector_errors_1_initial_load.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_errors_1_initial_load.png
similarity index 100%
rename from packages/devtools_app/test/goldens/integration_inspector_errors_1_initial_load.png
rename to packages/devtools_app/test/test_infra/goldens/integration_inspector_errors_1_initial_load.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/integration_inspector_errors_2_error_selected.png

diff --git a/packages/devtools_app/test/goldens/integration_inspector_errors_2_error_selected.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_errors_2_error_selected.png
similarity index 100%
rename from packages/devtools_app/test/goldens/integration_inspector_errors_2_error_selected.png
rename to packages/devtools_app/test/test_infra/goldens/integration_inspector_errors_2_error_selected.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/integration_inspector_initial_load.png

diff --git a/packages/devtools_app/test/goldens/integration_inspector_initial_load.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_initial_load.png
similarity index 100%
rename from packages/devtools_app/test/goldens/integration_inspector_initial_load.png
rename to packages/devtools_app/test/test_infra/goldens/integration_inspector_initial_load.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/integration_inspector_richtext_selected.png

diff --git a/packages/devtools_app/test/goldens/integration_inspector_richtext_selected.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_richtext_selected.png
similarity index 100%
rename from packages/devtools_app/test/goldens/integration_inspector_richtext_selected.png
rename to packages/devtools_app/test/test_infra/goldens/integration_inspector_richtext_selected.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/integration_inspector_scaffold_selected.png

diff --git a/packages/devtools_app/test/goldens/integration_inspector_scaffold_selected.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_scaffold_selected.png
similarity index 100%
rename from packages/devtools_app/test/goldens/integration_inspector_scaffold_selected.png
rename to packages/devtools_app/test/test_infra/goldens/integration_inspector_scaffold_selected.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/integration_inspector_select_center.png

diff --git a/packages/devtools_app/test/goldens/integration_inspector_select_center.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_select_center.png
similarity index 100%
rename from packages/devtools_app/test/goldens/integration_inspector_select_center.png
rename to packages/devtools_app/test/test_infra/goldens/integration_inspector_select_center.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/integration_inspector_select_center_details_tree.png

diff --git a/packages/devtools_app/test/goldens/integration_inspector_select_center_details_tree.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_select_center_details_tree.png
similarity index 100%
rename from packages/devtools_app/test/goldens/integration_inspector_select_center_details_tree.png
rename to packages/devtools_app/test/test_infra/goldens/integration_inspector_select_center_details_tree.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/integration_inspector_user_defined_only.png

diff --git a/packages/devtools_app/test/goldens/integration_inspector_user_defined_only.png b/packages/devtools_app/test/test_infra/goldens/integration_inspector_user_defined_only.png
similarity index 100%
rename from packages/devtools_app/test/goldens/integration_inspector_user_defined_only.png
rename to packages/devtools_app/test/test_infra/goldens/integration_inspector_user_defined_only.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/logging_controller_material_error.txt

diff --git a/packages/devtools_app/test/goldens/logging_controller_material_error.txt b/packages/devtools_app/test/test_infra/goldens/logging_controller_material_error.txt
similarity index 100%
rename from packages/devtools_app/test/goldens/logging_controller_material_error.txt
rename to packages/devtools_app/test/test_infra/goldens/logging_controller_material_error.txt

packages/devtools_app/test/test_infra/goldens/logging_controller_navigation.txt

diff --git a/packages/devtools_app/test/goldens/logging_controller_navigation.txt b/packages/devtools_app/test/test_infra/goldens/logging_controller_navigation.txt
similarity index 100%
rename from packages/devtools_app/test/goldens/logging_controller_navigation.txt
rename to packages/devtools_app/test/test_infra/goldens/logging_controller_navigation.txt

packages/devtools_app/test/test_infra/goldens/logging_controller_overflow_error.txt

diff --git a/packages/devtools_app/test/goldens/logging_controller_overflow_error.txt b/packages/devtools_app/test/test_infra/goldens/logging_controller_overflow_error.txt
similarity index 100%
rename from packages/devtools_app/test/goldens/logging_controller_overflow_error.txt
rename to packages/devtools_app/test/test_infra/goldens/logging_controller_overflow_error.txt

packages/devtools_app/test/test_infra/goldens/memory_chart_fixed_all.png

diff --git a/packages/devtools_app/test/goldens/memory_chart_fixed_all.png b/packages/devtools_app/test/test_infra/goldens/memory_chart_fixed_all.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_chart_fixed_all.png
rename to packages/devtools_app/test/test_infra/goldens/memory_chart_fixed_all.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_chart_fixed_five_minutes.png

diff --git a/packages/devtools_app/test/goldens/memory_chart_fixed_five_minutes.png b/packages/devtools_app/test/test_infra/goldens/memory_chart_fixed_five_minutes.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_chart_fixed_five_minutes.png
rename to packages/devtools_app/test/test_infra/goldens/memory_chart_fixed_five_minutes.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_chart_fixed_live.png

diff --git a/packages/devtools_app/test/goldens/memory_chart_fixed_live.png b/packages/devtools_app/test/test_infra/goldens/memory_chart_fixed_live.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_chart_fixed_live.png
rename to packages/devtools_app/test/test_infra/goldens/memory_chart_fixed_live.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_chart_scaled_all.png

diff --git a/packages/devtools_app/test/goldens/memory_chart_scaled_all.png b/packages/devtools_app/test/test_infra/goldens/memory_chart_scaled_all.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_chart_scaled_all.png
rename to packages/devtools_app/test/test_infra/goldens/memory_chart_scaled_all.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_chart_scaled_five_minute.png

diff --git a/packages/devtools_app/test/goldens/memory_chart_scaled_five_minute.png b/packages/devtools_app/test/test_infra/goldens/memory_chart_scaled_five_minute.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_chart_scaled_five_minute.png
rename to packages/devtools_app/test/test_infra/goldens/memory_chart_scaled_five_minute.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_chart_scaled_live.png

diff --git a/packages/devtools_app/test/goldens/memory_chart_scaled_live.png b/packages/devtools_app/test/test_infra/goldens/memory_chart_scaled_live.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_chart_scaled_live.png
rename to packages/devtools_app/test/test_infra/goldens/memory_chart_scaled_live.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_diff_empty1.png

diff --git a/packages/devtools_app/test/goldens/memory_diff_empty1.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_empty1.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_diff_empty1.png
rename to packages/devtools_app/test/test_infra/goldens/memory_diff_empty1.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_diff_empty2.png

diff --git a/packages/devtools_app/test/goldens/memory_diff_empty2.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_empty2.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_diff_empty2.png
rename to packages/devtools_app/test/test_infra/goldens/memory_diff_empty2.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_diff_filter_dialog_custom.png

diff --git a/packages/devtools_app/test/goldens/memory_diff_filter_dialog_custom.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_filter_dialog_custom.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_diff_filter_dialog_custom.png
rename to packages/devtools_app/test/test_infra/goldens/memory_diff_filter_dialog_custom.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_diff_filter_dialog_except.png

diff --git a/packages/devtools_app/test/goldens/memory_diff_filter_dialog_except.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_filter_dialog_except.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_diff_filter_dialog_except.png
rename to packages/devtools_app/test/test_infra/goldens/memory_diff_filter_dialog_except.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_diff_filter_dialog_only.png

diff --git a/packages/devtools_app/test/goldens/memory_diff_filter_dialog_only.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_filter_dialog_only.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_diff_filter_dialog_only.png
rename to packages/devtools_app/test/test_infra/goldens/memory_diff_filter_dialog_only.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_diff_filter_dialog_showAll.png

diff --git a/packages/devtools_app/test/goldens/memory_diff_filter_dialog_showAll.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_filter_dialog_showAll.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_diff_filter_dialog_showAll.png
rename to packages/devtools_app/test/test_infra/goldens/memory_diff_filter_dialog_showAll.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_diff_selected_class.png

diff --git a/packages/devtools_app/test/goldens/memory_diff_selected_class.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_selected_class.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_diff_selected_class.png
rename to packages/devtools_app/test/test_infra/goldens/memory_diff_selected_class.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_custom.png

diff --git a/packages/devtools_app/test/goldens/memory_diff_snapshot_custom.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_custom.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_diff_snapshot_custom.png
rename to packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_custom.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_custom_diff.png

diff --git a/packages/devtools_app/test/goldens/memory_diff_snapshot_custom_diff.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_custom_diff.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_diff_snapshot_custom_diff.png
rename to packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_custom_diff.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_custom_single.png

diff --git a/packages/devtools_app/test/goldens/memory_diff_snapshot_custom_single.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_custom_single.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_diff_snapshot_custom_single.png
rename to packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_custom_single.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_except.png

diff --git a/packages/devtools_app/test/goldens/memory_diff_snapshot_except.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_except.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_diff_snapshot_except.png
rename to packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_except.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_except_diff.png

diff --git a/packages/devtools_app/test/goldens/memory_diff_snapshot_except_diff.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_except_diff.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_diff_snapshot_except_diff.png
rename to packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_except_diff.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_except_single.png

diff --git a/packages/devtools_app/test/goldens/memory_diff_snapshot_except_single.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_except_single.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_diff_snapshot_except_single.png
rename to packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_except_single.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_only.png

diff --git a/packages/devtools_app/test/goldens/memory_diff_snapshot_only.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_only.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_diff_snapshot_only.png
rename to packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_only.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_only_diff.png

diff --git a/packages/devtools_app/test/goldens/memory_diff_snapshot_only_diff.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_only_diff.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_diff_snapshot_only_diff.png
rename to packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_only_diff.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_only_single.png

diff --git a/packages/devtools_app/test/goldens/memory_diff_snapshot_only_single.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_only_single.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_diff_snapshot_only_single.png
rename to packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_only_single.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_scene.png

diff --git a/packages/devtools_app/test/goldens/memory_diff_snapshot_scene.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_scene.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_diff_snapshot_scene.png
rename to packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_scene.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_scene_diff.png

diff --git a/packages/devtools_app/test/goldens/memory_diff_snapshot_scene_diff.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_scene_diff.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_diff_snapshot_scene_diff.png
rename to packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_scene_diff.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_scene_single.png

diff --git a/packages/devtools_app/test/goldens/memory_diff_snapshot_scene_single.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_scene_single.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_diff_snapshot_scene_single.png
rename to packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_scene_single.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_showAll.png

diff --git a/packages/devtools_app/test/goldens/memory_diff_snapshot_showAll.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_showAll.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_diff_snapshot_showAll.png
rename to packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_showAll.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_showAll_diff.png

diff --git a/packages/devtools_app/test/goldens/memory_diff_snapshot_showAll_diff.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_showAll_diff.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_diff_snapshot_showAll_diff.png
rename to packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_showAll_diff.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_showAll_single.png

diff --git a/packages/devtools_app/test/goldens/memory_diff_snapshot_showAll_single.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_showAll_single.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_diff_snapshot_showAll_single.png
rename to packages/devtools_app/test/test_infra/goldens/memory_diff_snapshot_showAll_single.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_diff_three_snapshots.png

diff --git a/packages/devtools_app/test/goldens/memory_diff_three_snapshots.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_three_snapshots.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_diff_three_snapshots.png
rename to packages/devtools_app/test/test_infra/goldens/memory_diff_three_snapshots.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_diff_three_snapshots1.png

diff --git a/packages/devtools_app/test/goldens/memory_diff_three_snapshots1.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_three_snapshots1.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_diff_three_snapshots1.png
rename to packages/devtools_app/test/test_infra/goldens/memory_diff_three_snapshots1.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_diff_three_snapshots2.png

diff --git a/packages/devtools_app/test/goldens/memory_diff_three_snapshots2.png b/packages/devtools_app/test/test_infra/goldens/memory_diff_three_snapshots2.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_diff_three_snapshots2.png
rename to packages/devtools_app/test/test_infra/goldens/memory_diff_three_snapshots2.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_heap_android.png

diff --git a/packages/devtools_app/test/goldens/memory_heap_android.png b/packages/devtools_app/test/test_infra/goldens/memory_heap_android.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_heap_android.png
rename to packages/devtools_app/test/test_infra/goldens/memory_heap_android.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_heap_tree.png

diff --git a/packages/devtools_app/test/goldens/memory_heap_tree.png b/packages/devtools_app/test/test_infra/goldens/memory_heap_tree.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_heap_tree.png
rename to packages/devtools_app/test/test_infra/goldens/memory_heap_tree.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/memory_hover_card.png

diff --git a/packages/devtools_app/test/goldens/memory_hover_card.png b/packages/devtools_app/test/test_infra/goldens/memory_hover_card.png
similarity index 100%
rename from packages/devtools_app/test/goldens/memory_hover_card.png
rename to packages/devtools_app/test/test_infra/goldens/memory_hover_card.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/offset_scrollbar_scrolled.png

diff --git a/packages/devtools_app/test/goldens/offset_scrollbar_scrolled.png b/packages/devtools_app/test/test_infra/goldens/offset_scrollbar_scrolled.png
similarity index 100%
rename from packages/devtools_app/test/goldens/offset_scrollbar_scrolled.png
rename to packages/devtools_app/test/test_infra/goldens/offset_scrollbar_scrolled.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/offset_scrollbar_startup.png

diff --git a/packages/devtools_app/test/goldens/offset_scrollbar_startup.png b/packages/devtools_app/test/test_infra/goldens/offset_scrollbar_startup.png
similarity index 100%
rename from packages/devtools_app/test/goldens/offset_scrollbar_startup.png
rename to packages/devtools_app/test/test_infra/goldens/offset_scrollbar_startup.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/provider_screen/list_error_banner.png

diff --git a/packages/devtools_app/test/goldens/provider_screen/list_error_banner.png b/packages/devtools_app/test/test_infra/goldens/provider_screen/list_error_banner.png
similarity index 100%
rename from packages/devtools_app/test/goldens/provider_screen/list_error_banner.png
rename to packages/devtools_app/test/test_infra/goldens/provider_screen/list_error_banner.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/provider_screen/no_selected_provider.png

diff --git a/packages/devtools_app/test/goldens/provider_screen/no_selected_provider.png b/packages/devtools_app/test/test_infra/goldens/provider_screen/no_selected_provider.png
similarity index 100%
rename from packages/devtools_app/test/goldens/provider_screen/no_selected_provider.png
rename to packages/devtools_app/test/test_infra/goldens/provider_screen/no_selected_provider.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/provider_screen/selected_provider.png

diff --git a/packages/devtools_app/test/goldens/provider_screen/selected_provider.png b/packages/devtools_app/test/test_infra/goldens/provider_screen/selected_provider.png
similarity index 100%
rename from packages/devtools_app/test/goldens/provider_screen/selected_provider.png
rename to packages/devtools_app/test/test_infra/goldens/provider_screen/selected_provider.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/provider_screen/selected_provider_error_banner.png

diff --git a/packages/devtools_app/test/goldens/provider_screen/selected_provider_error_banner.png b/packages/devtools_app/test/test_infra/goldens/provider_screen/selected_provider_error_banner.png
similarity index 100%
rename from packages/devtools_app/test/goldens/provider_screen/selected_provider_error_banner.png
rename to packages/devtools_app/test/test_infra/goldens/provider_screen/selected_provider_error_banner.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/riverpod_screen/list_error_banner.png

diff --git a/packages/devtools_app/test/goldens/riverpod_screen/list_error_banner.png b/packages/devtools_app/test/test_infra/goldens/riverpod_screen/list_error_banner.png
similarity index 100%
rename from packages/devtools_app/test/goldens/riverpod_screen/list_error_banner.png
rename to packages/devtools_app/test/test_infra/goldens/riverpod_screen/list_error_banner.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/riverpod_screen/no_selected_provider.png

diff --git a/packages/devtools_app/test/goldens/riverpod_screen/no_selected_provider.png b/packages/devtools_app/test/test_infra/goldens/riverpod_screen/no_selected_provider.png
similarity index 100%
rename from packages/devtools_app/test/goldens/riverpod_screen/no_selected_provider.png
rename to packages/devtools_app/test/test_infra/goldens/riverpod_screen/no_selected_provider.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/riverpod_screen/selected_provider.png

diff --git a/packages/devtools_app/test/goldens/riverpod_screen/selected_provider.png b/packages/devtools_app/test/test_infra/goldens/riverpod_screen/selected_provider.png
similarity index 100%
rename from packages/devtools_app/test/goldens/riverpod_screen/selected_provider.png
rename to packages/devtools_app/test/test_infra/goldens/riverpod_screen/selected_provider.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/riverpod_screen/selected_provider_error_banner.png

diff --git a/packages/devtools_app/test/goldens/riverpod_screen/selected_provider_error_banner.png b/packages/devtools_app/test/test_infra/goldens/riverpod_screen/selected_provider_error_banner.png
similarity index 100%
rename from packages/devtools_app/test/goldens/riverpod_screen/selected_provider_error_banner.png
rename to packages/devtools_app/test/test_infra/goldens/riverpod_screen/selected_provider_error_banner.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/settings_dialog_default.png

diff --git a/packages/devtools_app/test/goldens/settings_dialog_default.png b/packages/devtools_app/test/test_infra/goldens/settings_dialog_default.png
similarity index 100%
rename from packages/devtools_app/test/goldens/settings_dialog_default.png
rename to packages/devtools_app/test/test_infra/goldens/settings_dialog_default.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/settings_dialog_modified.png

diff --git a/packages/devtools_app/test/goldens/settings_dialog_modified.png b/packages/devtools_app/test/test_infra/goldens/settings_dialog_modified.png
similarity index 100%
rename from packages/devtools_app/test/goldens/settings_dialog_modified.png
rename to packages/devtools_app/test/test_infra/goldens/settings_dialog_modified.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/syntax_highlighting/comments.dart.golden

diff --git a/packages/devtools_app/test/goldens/syntax_highlighting/comments.dart.golden b/packages/devtools_app/test/test_infra/goldens/syntax_highlighting/comments.dart.golden
similarity index 100%
rename from packages/devtools_app/test/goldens/syntax_highlighting/comments.dart.golden
rename to packages/devtools_app/test/test_infra/goldens/syntax_highlighting/comments.dart.golden

packages/devtools_app/test/test_infra/goldens/syntax_highlighting/functions.dart.golden

diff --git a/packages/devtools_app/test/goldens/syntax_highlighting/functions.dart.golden b/packages/devtools_app/test/test_infra/goldens/syntax_highlighting/functions.dart.golden
similarity index 100%
rename from packages/devtools_app/test/goldens/syntax_highlighting/functions.dart.golden
rename to packages/devtools_app/test/test_infra/goldens/syntax_highlighting/functions.dart.golden

packages/devtools_app/test/test_infra/goldens/syntax_highlighting/handles_eof_gracefully.golden

diff --git a/packages/devtools_app/test/goldens/syntax_highlighting/handles_eof_gracefully.golden b/packages/devtools_app/test/test_infra/goldens/syntax_highlighting/handles_eof_gracefully.golden
similarity index 100%
rename from packages/devtools_app/test/goldens/syntax_highlighting/handles_eof_gracefully.golden
rename to packages/devtools_app/test/test_infra/goldens/syntax_highlighting/handles_eof_gracefully.golden

packages/devtools_app/test/test_infra/goldens/syntax_highlighting/keywords.dart.golden

diff --git a/packages/devtools_app/test/goldens/syntax_highlighting/keywords.dart.golden b/packages/devtools_app/test/test_infra/goldens/syntax_highlighting/keywords.dart.golden
similarity index 100%
rename from packages/devtools_app/test/goldens/syntax_highlighting/keywords.dart.golden
rename to packages/devtools_app/test/test_infra/goldens/syntax_highlighting/keywords.dart.golden

packages/devtools_app/test/test_infra/goldens/syntax_highlighting/literals.dart.golden

diff --git a/packages/devtools_app/test/goldens/syntax_highlighting/literals.dart.golden b/packages/devtools_app/test/test_infra/goldens/syntax_highlighting/literals.dart.golden
similarity index 100%
rename from packages/devtools_app/test/goldens/syntax_highlighting/literals.dart.golden
rename to packages/devtools_app/test/test_infra/goldens/syntax_highlighting/literals.dart.golden

packages/devtools_app/test/test_infra/goldens/syntax_highlighting/open_code_block.golden

diff --git a/packages/devtools_app/test/goldens/syntax_highlighting/open_code_block.golden b/packages/devtools_app/test/test_infra/goldens/syntax_highlighting/open_code_block.golden
similarity index 100%
rename from packages/devtools_app/test/goldens/syntax_highlighting/open_code_block.golden
rename to packages/devtools_app/test/test_infra/goldens/syntax_highlighting/open_code_block.golden

packages/devtools_app/test/test_infra/goldens/syntax_highlighting/operators.dart.golden

diff --git a/packages/devtools_app/test/goldens/syntax_highlighting/operators.dart.golden b/packages/devtools_app/test/test_infra/goldens/syntax_highlighting/operators.dart.golden
similarity index 100%
rename from packages/devtools_app/test/goldens/syntax_highlighting/operators.dart.golden
rename to packages/devtools_app/test/test_infra/goldens/syntax_highlighting/operators.dart.golden

packages/devtools_app/test/test_infra/goldens/syntax_highlighting/string_interpolation.dart.golden

diff --git a/packages/devtools_app/test/goldens/syntax_highlighting/string_interpolation.dart.golden b/packages/devtools_app/test/test_infra/goldens/syntax_highlighting/string_interpolation.dart.golden
similarity index 100%
rename from packages/devtools_app/test/goldens/syntax_highlighting/string_interpolation.dart.golden
rename to packages/devtools_app/test/test_infra/goldens/syntax_highlighting/string_interpolation.dart.golden

packages/devtools_app/test/test_infra/goldens/timeline_flame_chart_with_selected_frame.png

diff --git a/packages/devtools_app/test/goldens/timeline_flame_chart_with_selected_frame.png b/packages/devtools_app/test/test_infra/goldens/timeline_flame_chart_with_selected_frame.png
similarity index 100%
rename from packages/devtools_app/test/goldens/timeline_flame_chart_with_selected_frame.png
rename to packages/devtools_app/test/test_infra/goldens/timeline_flame_chart_with_selected_frame.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/treemap_apk.png

diff --git a/packages/devtools_app/test/goldens/treemap_apk.png b/packages/devtools_app/test/test_infra/goldens/treemap_apk.png
similarity index 100%
rename from packages/devtools_app/test/goldens/treemap_apk.png
rename to packages/devtools_app/test/test_infra/goldens/treemap_apk.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/treemap_sizes.png

diff --git a/packages/devtools_app/test/goldens/treemap_sizes.png b/packages/devtools_app/test/test_infra/goldens/treemap_sizes.png
similarity index 100%
rename from packages/devtools_app/test/goldens/treemap_sizes.png
rename to packages/devtools_app/test/test_infra/goldens/treemap_sizes.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/treemap_sizes_zoom.png

diff --git a/packages/devtools_app/test/goldens/treemap_sizes_zoom.png b/packages/devtools_app/test/test_infra/goldens/treemap_sizes_zoom.png
similarity index 100%
rename from packages/devtools_app/test/goldens/treemap_sizes_zoom.png
rename to packages/devtools_app/test/test_infra/goldens/treemap_sizes_zoom.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/treemap_v8.png

diff --git a/packages/devtools_app/test/goldens/treemap_v8.png b/packages/devtools_app/test/test_infra/goldens/treemap_v8.png
similarity index 100%
rename from packages/devtools_app/test/goldens/treemap_v8.png
rename to packages/devtools_app/test/test_infra/goldens/treemap_v8.png
Binary files differ

packages/devtools_app/test/test_infra/goldens/treemap_v8_zoom.png

diff --git a/packages/devtools_app/test/goldens/treemap_v8_zoom.png b/packages/devtools_app/test/test_infra/goldens/treemap_v8_zoom.png
similarity index 100%
rename from packages/devtools_app/test/goldens/treemap_v8_zoom.png
rename to packages/devtools_app/test/test_infra/goldens/treemap_v8_zoom.png
Binary files differ

packages/devtools_app/test/test_infra/goldens_stable/inspector_controller_details_tree_scaffold.txt

diff --git a/packages/devtools_app/test/goldens_stable/inspector_controller_details_tree_scaffold.txt b/packages/devtools_app/test/test_infra/goldens_stable/inspector_controller_details_tree_scaffold.txt
similarity index 100%
rename from packages/devtools_app/test/goldens_stable/inspector_controller_details_tree_scaffold.txt
rename to packages/devtools_app/test/test_infra/goldens_stable/inspector_controller_details_tree_scaffold.txt

packages/devtools_app/test/test_infra/goldens_stable/inspector_controller_details_tree_scaffold_expanded.txt

diff --git a/packages/devtools_app/test/goldens_stable/inspector_controller_details_tree_scaffold_expanded.txt b/packages/devtools_app/test/test_infra/goldens_stable/inspector_controller_details_tree_scaffold_expanded.txt
similarity index 100%
rename from packages/devtools_app/test/goldens_stable/inspector_controller_details_tree_scaffold_expanded.txt
rename to packages/devtools_app/test/test_infra/goldens_stable/inspector_controller_details_tree_scaffold_expanded.txt

packages/devtools_app/test/test_infra/goldens_stable/inspector_controller_details_tree_scaffold_with_styles.txt

diff --git a/packages/devtools_app/test/goldens_stable/inspector_controller_details_tree_scaffold_with_styles.txt b/packages/devtools_app/test/test_infra/goldens_stable/inspector_controller_details_tree_scaffold_with_styles.txt
similarity index 100%
rename from packages/devtools_app/test/goldens_stable/inspector_controller_details_tree_scaffold_with_styles.txt
rename to packages/devtools_app/test/test_infra/goldens_stable/inspector_controller_details_tree_scaffold_with_styles.txt

packages/devtools_app/test/test_infra/goldens_stable/inspector_controller_details_tree_scrolled_to_center.txt

diff --git a/packages/devtools_app/test/goldens_stable/inspector_controller_details_tree_scrolled_to_center.txt b/packages/devtools_app/test/test_infra/goldens_stable/inspector_controller_details_tree_scrolled_to_center.txt
similarity index 100%
rename from packages/devtools_app/test/goldens_stable/inspector_controller_details_tree_scrolled_to_center.txt
rename to packages/devtools_app/test/test_infra/goldens_stable/inspector_controller_details_tree_scrolled_to_center.txt

packages/devtools_app/test/test_infra/goldens_stable/inspector_controller_initial_tree_with_styles.txt

diff --git a/packages/devtools_app/test/goldens_stable/inspector_controller_initial_tree_with_styles.txt b/packages/devtools_app/test/test_infra/goldens_stable/inspector_controller_initial_tree_with_styles.txt
similarity index 100%
rename from packages/devtools_app/test/goldens_stable/inspector_controller_initial_tree_with_styles.txt
rename to packages/devtools_app/test/test_infra/goldens_stable/inspector_controller_initial_tree_with_styles.txt

packages/devtools_app/test/test_infra/goldens_stable/inspector_controller_selection_with_styles.txt

diff --git a/packages/devtools_app/test/goldens_stable/inspector_controller_selection_with_styles.txt b/packages/devtools_app/test/test_infra/goldens_stable/inspector_controller_selection_with_styles.txt
similarity index 100%
rename from packages/devtools_app/test/goldens_stable/inspector_controller_selection_with_styles.txt
rename to packages/devtools_app/test/test_infra/goldens_stable/inspector_controller_selection_with_styles.txt

packages/devtools_app/test/test_infra/goldens_stable/inspector_controller_text_details_tree.txt

diff --git a/packages/devtools_app/test/goldens_stable/inspector_controller_text_details_tree.txt b/packages/devtools_app/test/test_infra/goldens_stable/inspector_controller_text_details_tree.txt
similarity index 100%
rename from packages/devtools_app/test/goldens_stable/inspector_controller_text_details_tree.txt
rename to packages/devtools_app/test/test_infra/goldens_stable/inspector_controller_text_details_tree.txt

packages/devtools_app/test/test_infra/goldens_stable/inspector_controller_text_details_tree_richtext_selected.txt

diff --git a/packages/devtools_app/test/goldens_stable/inspector_controller_text_details_tree_richtext_selected.txt b/packages/devtools_app/test/test_infra/goldens_stable/inspector_controller_text_details_tree_richtext_selected.txt
similarity index 100%
rename from packages/devtools_app/test/goldens_stable/inspector_controller_text_details_tree_richtext_selected.txt
rename to packages/devtools_app/test/test_infra/goldens_stable/inspector_controller_text_details_tree_richtext_selected.txt

packages/devtools_app/test/test_infra/goldens_stable/inspector_controller_text_details_tree_with_styles.txt

diff --git a/packages/devtools_app/test/goldens_stable/inspector_controller_text_details_tree_with_styles.txt b/packages/devtools_app/test/test_infra/goldens_stable/inspector_controller_text_details_tree_with_styles.txt
similarity index 100%
rename from packages/devtools_app/test/goldens_stable/inspector_controller_text_details_tree_with_styles.txt
rename to packages/devtools_app/test/test_infra/goldens_stable/inspector_controller_text_details_tree_with_styles.txt

packages/devtools_app/test/test_infra/goldens_stable/inspector_service_details_tree.txt

diff --git a/packages/devtools_app/test/goldens_stable/inspector_service_details_tree.txt b/packages/devtools_app/test/test_infra/goldens_stable/inspector_service_details_tree.txt
similarity index 100%
rename from packages/devtools_app/test/goldens_stable/inspector_service_details_tree.txt
rename to packages/devtools_app/test/test_infra/goldens_stable/inspector_service_details_tree.txt

packages/devtools_app/test/test_infra/goldens_stable/inspector_service_text_details_tree.txt

diff --git a/packages/devtools_app/test/goldens_stable/inspector_service_text_details_tree.txt b/packages/devtools_app/test/test_infra/goldens_stable/inspector_service_text_details_tree.txt
similarity index 100%
rename from packages/devtools_app/test/goldens_stable/inspector_service_text_details_tree.txt
rename to packages/devtools_app/test/test_infra/goldens_stable/inspector_service_text_details_tree.txt

packages/devtools_app/test/test_infra/goldens_stable/logging_controller_material_error.txt

diff --git a/packages/devtools_app/test/goldens_stable/logging_controller_material_error.txt b/packages/devtools_app/test/test_infra/goldens_stable/logging_controller_material_error.txt
similarity index 100%
rename from packages/devtools_app/test/goldens_stable/logging_controller_material_error.txt
rename to packages/devtools_app/test/test_infra/goldens_stable/logging_controller_material_error.txt

packages/devtools_app/test/test_infra/goldens_stable/logging_controller_navigation.txt

diff --git a/packages/devtools_app/test/goldens_stable/logging_controller_navigation.txt b/packages/devtools_app/test/test_infra/goldens_stable/logging_controller_navigation.txt
similarity index 100%
rename from packages/devtools_app/test/goldens_stable/logging_controller_navigation.txt
rename to packages/devtools_app/test/test_infra/goldens_stable/logging_controller_navigation.txt

packages/devtools_app/test/test_infra/goldens_stable/logging_controller_overflow_error.txt

diff --git a/packages/devtools_app/test/goldens_stable/logging_controller_overflow_error.txt b/packages/devtools_app/test/test_infra/goldens_stable/logging_controller_overflow_error.txt
similarity index 100%
rename from packages/devtools_app/test/goldens_stable/logging_controller_overflow_error.txt
rename to packages/devtools_app/test/test_infra/goldens_stable/logging_controller_overflow_error.txt

packages/devtools_app/test/test_infra/matchers.dart

diff --git a/packages/devtools_app/test/test_infra/matchers.dart b/packages/devtools_app/test/test_infra/matchers.dart
index bb02cf7..6eb12de 100644
--- a/packages/devtools_app/test/test_infra/matchers.dart
+++ b/packages/devtools_app/test/test_infra/matchers.dart
@@ -61,7 +61,7 @@
 
 class _EqualsGoldenIgnoringHashCodes extends Matcher {
   _EqualsGoldenIgnoringHashCodes(String pathWithinGoldenDirectory) {
-    path = 'test/goldens$_goldensSuffix/$pathWithinGoldenDirectory';
+    path = 'test/test_infra/goldens$_goldensSuffix/$pathWithinGoldenDirectory';
     try {
       _value = _normalize(io.File(path).readAsStringSync());
     } catch (e) {

packages/devtools_app/test/test_infra/scenes/memory/default.dart

diff --git a/packages/devtools_app/test/test_infra/scenes/memory/default.dart b/packages/devtools_app/test/test_infra/scenes/memory/default.dart
index a062e77..bb0da6b 100644
--- a/packages/devtools_app/test/test_infra/scenes/memory/default.dart
+++ b/packages/devtools_app/test/test_infra/scenes/memory/default.dart
@@ -19,9 +19,9 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:stager/stager.dart';
 
-import '../../../test_data/memory.dart';
-import '../../../test_data/memory/heap/heap_data.dart';
-import '../../../test_data/memory_allocation.dart';
+import '../../../test_infra/test_data/memory.dart';
+import '../../../test_infra/test_data/memory/heap/heap_data.dart';
+import '../../../test_infra/test_data/memory_allocation.dart';
 
 /// To run:
 /// flutter run -t test/scenes/memory/default.stager_app.dart -d macos

packages/devtools_app/test/test_infra/scenes/memory/diff_snapshot.dart

diff --git a/packages/devtools_app/test/test_infra/scenes/memory/diff_snapshot.dart b/packages/devtools_app/test/test_infra/scenes/memory/diff_snapshot.dart
index d772457..de23378 100644
--- a/packages/devtools_app/test/test_infra/scenes/memory/diff_snapshot.dart
+++ b/packages/devtools_app/test/test_infra/scenes/memory/diff_snapshot.dart
@@ -15,7 +15,7 @@
 import 'package:flutter_test/flutter_test.dart';
 import 'package:stager/stager.dart';
 
-import '../../../test_data/memory/heap/heap_data.dart';
+import '../../../test_infra/test_data/memory/heap/heap_data.dart';
 
 /// To run:
 /// flutter run -t test/scenes/memory/diff_snapshot.stager_app.dart -d macos

packages/devtools_app/test/test_infra/test_data/app_size/apk_analysis.dart

diff --git a/packages/devtools_app/test/test_data/app_size/apk_analysis.dart b/packages/devtools_app/test/test_infra/test_data/app_size/apk_analysis.dart
similarity index 100%
rename from packages/devtools_app/test/test_data/app_size/apk_analysis.dart
rename to packages/devtools_app/test/test_infra/test_data/app_size/apk_analysis.dart

packages/devtools_app/test/test_infra/test_data/app_size/deferred_app.dart

diff --git a/packages/devtools_app/test/test_data/app_size/deferred_app.dart b/packages/devtools_app/test/test_infra/test_data/app_size/deferred_app.dart
similarity index 100%
rename from packages/devtools_app/test/test_data/app_size/deferred_app.dart
rename to packages/devtools_app/test/test_infra/test_data/app_size/deferred_app.dart

packages/devtools_app/test/test_infra/test_data/app_size/diff_deferred_app.dart

diff --git a/packages/devtools_app/test/test_data/app_size/diff_deferred_app.dart b/packages/devtools_app/test/test_infra/test_data/app_size/diff_deferred_app.dart
similarity index 100%
rename from packages/devtools_app/test/test_data/app_size/diff_deferred_app.dart
rename to packages/devtools_app/test/test_infra/test_data/app_size/diff_deferred_app.dart

packages/devtools_app/test/test_infra/test_data/app_size/diff_no_deferred_app.dart

diff --git a/packages/devtools_app/test/test_data/app_size/diff_no_deferred_app.dart b/packages/devtools_app/test/test_infra/test_data/app_size/diff_no_deferred_app.dart
similarity index 100%
rename from packages/devtools_app/test/test_data/app_size/diff_no_deferred_app.dart
rename to packages/devtools_app/test/test_infra/test_data/app_size/diff_no_deferred_app.dart

packages/devtools_app/test/test_infra/test_data/app_size/new_v8.dart

diff --git a/packages/devtools_app/test/test_data/app_size/new_v8.dart b/packages/devtools_app/test/test_infra/test_data/app_size/new_v8.dart
similarity index 100%
rename from packages/devtools_app/test/test_data/app_size/new_v8.dart
rename to packages/devtools_app/test/test_infra/test_data/app_size/new_v8.dart

packages/devtools_app/test/test_infra/test_data/app_size/old_v8.dart

diff --git a/packages/devtools_app/test/test_data/app_size/old_v8.dart b/packages/devtools_app/test/test_infra/test_data/app_size/old_v8.dart
similarity index 100%
rename from packages/devtools_app/test/test_data/app_size/old_v8.dart
rename to packages/devtools_app/test/test_infra/test_data/app_size/old_v8.dart

packages/devtools_app/test/test_infra/test_data/app_size/precompiler_trace.dart

diff --git a/packages/devtools_app/test/test_data/app_size/precompiler_trace.dart b/packages/devtools_app/test/test_infra/test_data/app_size/precompiler_trace.dart
similarity index 100%
rename from packages/devtools_app/test/test_data/app_size/precompiler_trace.dart
rename to packages/devtools_app/test/test_infra/test_data/app_size/precompiler_trace.dart

packages/devtools_app/test/test_infra/test_data/app_size/sizes.dart

diff --git a/packages/devtools_app/test/test_data/app_size/sizes.dart b/packages/devtools_app/test/test_infra/test_data/app_size/sizes.dart
similarity index 100%
rename from packages/devtools_app/test/test_data/app_size/sizes.dart
rename to packages/devtools_app/test/test_infra/test_data/app_size/sizes.dart

packages/devtools_app/test/test_infra/test_data/app_size/small_sizes.dart

diff --git a/packages/devtools_app/test/test_data/app_size/small_sizes.dart b/packages/devtools_app/test/test_infra/test_data/app_size/small_sizes.dart
similarity index 100%
rename from packages/devtools_app/test/test_data/app_size/small_sizes.dart
rename to packages/devtools_app/test/test_infra/test_data/app_size/small_sizes.dart

packages/devtools_app/test/test_infra/test_data/app_size/unsupported_file.dart

diff --git a/packages/devtools_app/test/test_data/app_size/unsupported_file.dart b/packages/devtools_app/test/test_infra/test_data/app_size/unsupported_file.dart
similarity index 100%
rename from packages/devtools_app/test/test_data/app_size/unsupported_file.dart
rename to packages/devtools_app/test/test_infra/test_data/app_size/unsupported_file.dart

packages/devtools_app/test/test_infra/test_data/cpu_profile.dart

diff --git a/packages/devtools_app/test/test_data/cpu_profile.dart b/packages/devtools_app/test/test_infra/test_data/cpu_profile.dart
similarity index 100%
rename from packages/devtools_app/test/test_data/cpu_profile.dart
rename to packages/devtools_app/test/test_infra/test_data/cpu_profile.dart

packages/devtools_app/test/test_infra/test_data/debugger/vm_service_object_tree.dart

diff --git a/packages/devtools_app/test/test_data/debugger/vm_service_object_tree.dart b/packages/devtools_app/test/test_infra/test_data/debugger/vm_service_object_tree.dart
similarity index 100%
rename from packages/devtools_app/test/test_data/debugger/vm_service_object_tree.dart
rename to packages/devtools_app/test/test_infra/test_data/debugger/vm_service_object_tree.dart

packages/devtools_app/test/test_infra/test_data/memory.dart

diff --git a/packages/devtools_app/test/test_data/memory.dart b/packages/devtools_app/test/test_infra/test_data/memory.dart
similarity index 100%
rename from packages/devtools_app/test/test_data/memory.dart
rename to packages/devtools_app/test/test_infra/test_data/memory.dart

packages/devtools_app/test/test_infra/test_data/memory/allocation_tracing/allocation_trace.json

diff --git a/packages/devtools_app/test/test_data/memory/allocation_tracing/allocation_trace.json b/packages/devtools_app/test/test_infra/test_data/memory/allocation_tracing/allocation_trace.json
similarity index 100%
rename from packages/devtools_app/test/test_data/memory/allocation_tracing/allocation_trace.json
rename to packages/devtools_app/test/test_infra/test_data/memory/allocation_tracing/allocation_trace.json

packages/devtools_app/test/test_infra/test_data/memory/heap/counter_snapshot1.json

diff --git a/packages/devtools_app/test/test_data/memory/heap/counter_snapshot1.json b/packages/devtools_app/test/test_infra/test_data/memory/heap/counter_snapshot1.json
similarity index 100%
rename from packages/devtools_app/test/test_data/memory/heap/counter_snapshot1.json
rename to packages/devtools_app/test/test_infra/test_data/memory/heap/counter_snapshot1.json

packages/devtools_app/test/test_infra/test_data/memory/heap/counter_snapshot2.json

diff --git a/packages/devtools_app/test/test_data/memory/heap/counter_snapshot2.json b/packages/devtools_app/test/test_infra/test_data/memory/heap/counter_snapshot2.json
similarity index 100%
rename from packages/devtools_app/test/test_data/memory/heap/counter_snapshot2.json
rename to packages/devtools_app/test/test_infra/test_data/memory/heap/counter_snapshot2.json

packages/devtools_app/test/test_infra/test_data/memory/heap/counter_snapshot3.json

diff --git a/packages/devtools_app/test/test_data/memory/heap/counter_snapshot3.json b/packages/devtools_app/test/test_infra/test_data/memory/heap/counter_snapshot3.json
similarity index 100%
rename from packages/devtools_app/test/test_data/memory/heap/counter_snapshot3.json
rename to packages/devtools_app/test/test_infra/test_data/memory/heap/counter_snapshot3.json

packages/devtools_app/test/test_infra/test_data/memory/heap/counter_snapshot4.json

diff --git a/packages/devtools_app/test/test_data/memory/heap/counter_snapshot4.json b/packages/devtools_app/test/test_infra/test_data/memory/heap/counter_snapshot4.json
similarity index 100%
rename from packages/devtools_app/test/test_data/memory/heap/counter_snapshot4.json
rename to packages/devtools_app/test/test_infra/test_data/memory/heap/counter_snapshot4.json

packages/devtools_app/test/test_infra/test_data/memory/heap/heap_data.dart

diff --git a/packages/devtools_app/test/test_data/memory/heap/heap_data.dart b/packages/devtools_app/test/test_infra/test_data/memory/heap/heap_data.dart
similarity index 95%
rename from packages/devtools_app/test/test_data/memory/heap/heap_data.dart
rename to packages/devtools_app/test/test_infra/test_data/memory/heap/heap_data.dart
index f0c8c71..841e1ba 100644
--- a/packages/devtools_app/test/test_data/memory/heap/heap_data.dart
+++ b/packages/devtools_app/test/test_infra/test_data/memory/heap/heap_data.dart
@@ -9,7 +9,7 @@
 
 import '../leaks/leaks_data.dart';
 
-const _dataDir = 'test/test_data/memory/heap/';
+const _dataDir = 'test/test_infra/test_data/memory/heap/';
 
 typedef HeapLoader = Future<AdaptedHeapData> Function();
 

packages/devtools_app/test/test_infra/test_data/memory/leaks/leaking_demo_app.raw.json

diff --git a/packages/devtools_app/test/test_data/memory/leaks/leaking_demo_app.raw.json b/packages/devtools_app/test/test_infra/test_data/memory/leaks/leaking_demo_app.raw.json
similarity index 100%
rename from packages/devtools_app/test/test_data/memory/leaks/leaking_demo_app.raw.json
rename to packages/devtools_app/test/test_infra/test_data/memory/leaks/leaking_demo_app.raw.json
Binary files differ

packages/devtools_app/test/test_infra/test_data/memory/leaks/leaking_demo_app.yaml

diff --git a/packages/devtools_app/test/test_data/memory/leaks/leaking_demo_app.yaml b/packages/devtools_app/test/test_infra/test_data/memory/leaks/leaking_demo_app.yaml
similarity index 100%
rename from packages/devtools_app/test/test_data/memory/leaks/leaking_demo_app.yaml
rename to packages/devtools_app/test/test_infra/test_data/memory/leaks/leaking_demo_app.yaml

packages/devtools_app/test/test_infra/test_data/memory/leaks/leaks_data.dart

diff --git a/packages/devtools_app/test/test_data/memory/leaks/leaks_data.dart b/packages/devtools_app/test/test_infra/test_data/memory/leaks/leaks_data.dart
similarity index 92%
rename from packages/devtools_app/test/test_data/memory/leaks/leaks_data.dart
rename to packages/devtools_app/test/test_infra/test_data/memory/leaks/leaks_data.dart
index 43d36ff..888f068 100644
--- a/packages/devtools_app/test/test_data/memory/leaks/leaks_data.dart
+++ b/packages/devtools_app/test/test_infra/test_data/memory/leaks/leaks_data.dart
@@ -7,7 +7,7 @@
 
 import 'package:devtools_app/src/screens/memory/panes/leaks/diagnostics/model.dart';
 
-const _dataDir = 'test/test_data/memory/leaks/';
+const _dataDir = 'test/test_infra/test_data/memory/leaks/';
 
 class GoldenLeakTest {
   GoldenLeakTest({

packages/devtools_app/test/test_infra/test_data/memory_allocation.dart

diff --git a/packages/devtools_app/test/test_data/memory_allocation.dart b/packages/devtools_app/test/test_infra/test_data/memory_allocation.dart
similarity index 100%
rename from packages/devtools_app/test/test_data/memory_allocation.dart
rename to packages/devtools_app/test/test_infra/test_data/memory_allocation.dart

packages/devtools_app/test/test_infra/test_data/network.dart

diff --git a/packages/devtools_app/test/test_data/network.dart b/packages/devtools_app/test/test_infra/test_data/network.dart
similarity index 100%
rename from packages/devtools_app/test/test_data/network.dart
rename to packages/devtools_app/test/test_infra/test_data/network.dart

packages/devtools_app/test/test_infra/test_data/performance.dart

diff --git a/packages/devtools_app/test/test_data/performance.dart b/packages/devtools_app/test/test_infra/test_data/performance.dart
similarity index 99%
rename from packages/devtools_app/test/test_data/performance.dart
rename to packages/devtools_app/test/test_infra/test_data/performance.dart
index cab846a..e64b7cd 100644
--- a/packages/devtools_app/test/test_data/performance.dart
+++ b/packages/devtools_app/test/test_infra/test_data/performance.dart
@@ -6,7 +6,7 @@
 
 import 'package:devtools_app/devtools_app.dart';
 
-import '../test_infra/utils/test_utils.dart';
+import '../../test_infra/utils/test_utils.dart';
 import 'cpu_profile.dart';
 import 'performance_raster_stats.dart';
 
@@ -253,7 +253,7 @@
     '            Semantics [193938741736 μs - 193938742484 μs]\n'
     '            Finalize tree [193938742493 μs - 193938742582 μs]\n';
 
-final goldenUiTraceEvents = [
+final goldenUiTraceEvents = <TraceEventWrapper>[
   vsyncTrace,
   animatorBeginFrameTrace,
   frameworkWorkloadTrace,
@@ -1382,7 +1382,7 @@
   'ph': 'E',
   'args': {}
 });
-final durationEventsWithDuplicateTraces = [
+final durationEventsWithDuplicateTraces = <TraceEventWrapper>[
   gpuRasterizerDrawTrace,
   transformLayerStart1,
   transformLayerStart2,

packages/devtools_app/test/test_infra/test_data/performance_raster_stats.dart

diff --git a/packages/devtools_app/test/test_data/performance_raster_stats.dart b/packages/devtools_app/test/test_infra/test_data/performance_raster_stats.dart
similarity index 100%
rename from packages/devtools_app/test/test_data/performance_raster_stats.dart
rename to packages/devtools_app/test/test_infra/test_data/performance_raster_stats.dart

packages/devtools_app/test/test_infra/test_data/syntax_highlighting/comments.dart

diff --git a/packages/devtools_app/test/test_data/syntax_highlighting/comments.dart b/packages/devtools_app/test/test_infra/test_data/syntax_highlighting/comments.dart
similarity index 100%
rename from packages/devtools_app/test/test_data/syntax_highlighting/comments.dart
rename to packages/devtools_app/test/test_infra/test_data/syntax_highlighting/comments.dart

packages/devtools_app/test/test_infra/test_data/syntax_highlighting/functions.dart

diff --git a/packages/devtools_app/test/test_data/syntax_highlighting/functions.dart b/packages/devtools_app/test/test_infra/test_data/syntax_highlighting/functions.dart
similarity index 100%
rename from packages/devtools_app/test/test_data/syntax_highlighting/functions.dart
rename to packages/devtools_app/test/test_infra/test_data/syntax_highlighting/functions.dart

packages/devtools_app/test/test_infra/test_data/syntax_highlighting/keywords.dart

diff --git a/packages/devtools_app/test/test_data/syntax_highlighting/keywords.dart b/packages/devtools_app/test/test_infra/test_data/syntax_highlighting/keywords.dart
similarity index 100%
rename from packages/devtools_app/test/test_data/syntax_highlighting/keywords.dart
rename to packages/devtools_app/test/test_infra/test_data/syntax_highlighting/keywords.dart

packages/devtools_app/test/test_infra/test_data/syntax_highlighting/literals.dart

diff --git a/packages/devtools_app/test/test_data/syntax_highlighting/literals.dart b/packages/devtools_app/test/test_infra/test_data/syntax_highlighting/literals.dart
similarity index 100%
rename from packages/devtools_app/test/test_data/syntax_highlighting/literals.dart
rename to packages/devtools_app/test/test_infra/test_data/syntax_highlighting/literals.dart

packages/devtools_app/test/test_infra/test_data/syntax_highlighting/operators.dart

diff --git a/packages/devtools_app/test/test_data/syntax_highlighting/operators.dart b/packages/devtools_app/test/test_infra/test_data/syntax_highlighting/operators.dart
similarity index 100%
rename from packages/devtools_app/test/test_data/syntax_highlighting/operators.dart
rename to packages/devtools_app/test/test_infra/test_data/syntax_highlighting/operators.dart

packages/devtools_app/test/test_infra/test_data/syntax_highlighting/string_interpolation.dart

diff --git a/packages/devtools_app/test/test_data/syntax_highlighting/string_interpolation.dart b/packages/devtools_app/test/test_infra/test_data/syntax_highlighting/string_interpolation.dart
similarity index 100%
rename from packages/devtools_app/test/test_data/syntax_highlighting/string_interpolation.dart
rename to packages/devtools_app/test/test_infra/test_data/syntax_highlighting/string_interpolation.dart

packages/devtools_app/test/test_infra/test_data/treemap_sizes.json

diff --git a/packages/devtools_app/test/test_data/treemap_sizes.json b/packages/devtools_app/test/test_infra/test_data/treemap_sizes.json
similarity index 100%
rename from packages/devtools_app/test/test_data/treemap_sizes.json
rename to packages/devtools_app/test/test_infra/test_data/treemap_sizes.json

packages/devtools_app/test/test_infra/test_data/treemap_v8_new.json

diff --git a/packages/devtools_app/test/test_data/treemap_v8_new.json b/packages/devtools_app/test/test_infra/test_data/treemap_v8_new.json
similarity index 100%
rename from packages/devtools_app/test/test_data/treemap_v8_new.json
rename to packages/devtools_app/test/test_infra/test_data/treemap_v8_new.json

packages/devtools_app/test/test_infra/test_data/treemap_v8_old.json

diff --git a/packages/devtools_app/test/test_data/treemap_v8_old.json b/packages/devtools_app/test/test_infra/test_data/treemap_v8_old.json
similarity index 100%
rename from packages/devtools_app/test/test_data/treemap_v8_old.json
rename to packages/devtools_app/test/test_infra/test_data/treemap_v8_old.json