diff --git a/lib/web_ui/dev/README.md b/lib/web_ui/dev/README.md
index c38108e5607cf309546beede2145784b1be26dcc..ebc9211c46da5bbff1046ae0ee12efb4e227b0c1 100644
--- a/lib/web_ui/dev/README.md
+++ b/lib/web_ui/dev/README.md
@@ -20,3 +20,15 @@ or:
 ```
 felt build --watch
 ```
+
+## Configuration files
+
+`chrome_lock.yaml` contains the version of Chrome we use to test Flutter for
+web. Chrome is not automatically updated whenever a new release is available.
+Instead, we update this file manually once in a while.
+
+`goldens_lock.yaml` refers to a revision in the https://github.com/flutter/goldens
+repo. Screenshot tests are compared with the golden files at that revision.
+When making engine changes that affect screenshots, first submit a PR to
+flutter/goldens updating the screenshots. Then update this file pointing to
+the new revision.
diff --git a/lib/web_ui/dev/environment.dart b/lib/web_ui/dev/environment.dart
index c1b85847c75d4861b7048c2e26b35d3647a67e85..c6c085423242129d7dda24dae6cefe3b82414cd2 100644
--- a/lib/web_ui/dev/environment.dart
+++ b/lib/web_ui/dev/environment.dart
@@ -103,4 +103,17 @@ class Environment {
     webUiRootDir.path,
     '.dart_tool',
   ));
+
+  /// Path to the "dev" directory containing engine developer tools and
+  /// configuration files.
+  io.Directory get webUiDevDir => io.Directory(pathlib.join(
+    webUiRootDir.path,
+    'dev',
+  ));
+
+  /// Path to the clone of the flutter/goldens repository.
+  io.Directory get webUiGoldensRepositoryDirectory => io.Directory(pathlib.join(
+    webUiDartToolDir.path,
+    'goldens',
+  ));
 }
diff --git a/lib/web_ui/dev/goldens.dart b/lib/web_ui/dev/goldens.dart
index d0dc5bd03d304b91d9faa1cc98a7d945fa96d83a..3ab47db707e1306f0bd4669834efc031d0c51ef5 100644
--- a/lib/web_ui/dev/goldens.dart
+++ b/lib/web_ui/dev/goldens.dart
@@ -3,6 +3,11 @@
 // found in the LICENSE file.
 import 'dart:io' as io;
 import 'package:image/image.dart';
+import 'package:path/path.dart' as path;
+import 'package:yaml/yaml.dart';
+
+import 'environment.dart';
+import 'utils.dart';
 
 void main(List<String> args) {
   final io.File fileA = io.File(args[0]);
@@ -10,7 +15,7 @@ void main(List<String> args) {
   final Image imageA = decodeNamedImage(fileA.readAsBytesSync(), 'a.png');
   final Image imageB = decodeNamedImage(fileB.readAsBytesSync(), 'b.png');
   final ImageDiff diff = ImageDiff(golden: imageA, other: imageB);
-  print('Diff: ${(diff.rate * 100).toStringAsFixed(4)}');
+  print('Diff: ${(diff.rate * 100).toStringAsFixed(4)}%');
 }
 
 /// This class encapsulates visually diffing an Image with any other.
@@ -140,3 +145,72 @@ class ImageDiff {
 String getPrintableDiffFilesInfo(double diffRate, double maxRate) =>
   '(${((diffRate) * 100).toStringAsFixed(4)}% of pixels were different. '
   'Maximum allowed rate is: ${(maxRate * 100).toStringAsFixed(4)}%).';
+
+/// Fetches golden files from github.com/flutter/goldens, cloning the repository if necessary.
+///
+/// The repository is cloned into web_ui/.dart_tool.
+Future<void> fetchGoldens() async {
+  await _GoldensRepoFetcher().fetch();
+}
+
+class _GoldensRepoFetcher {
+  String _repository;
+  String _revision;
+
+  Future<void> fetch() async {
+    final io.File lockFile = io.File(
+      path.join(environment.webUiDevDir.path, 'goldens_lock.yaml')
+    );
+    final YamlMap lock = loadYaml(lockFile.readAsStringSync());
+    _repository = lock['repository'];
+    _revision = lock['revision'];
+
+    final String localRevision = await _getLocalRevision();
+    if (localRevision == _revision) {
+      return;
+    }
+
+    print('Fetching $_repository@$_revision');
+
+    if (!environment.webUiGoldensRepositoryDirectory.existsSync()) {
+      environment.webUiGoldensRepositoryDirectory.createSync(recursive: true);
+      await runProcess(
+        'git',
+        <String>['init'],
+        workingDirectory: environment.webUiGoldensRepositoryDirectory.path,
+        mustSucceed: true,
+      );
+      await runProcess(
+        'git',
+        <String>['remote', 'add', 'origin', _repository],
+        workingDirectory: environment.webUiGoldensRepositoryDirectory.path,
+        mustSucceed: true,
+      );
+    }
+
+    await runProcess(
+      'git',
+      <String>['fetch', 'origin', 'master'],
+      workingDirectory: environment.webUiGoldensRepositoryDirectory.path,
+      mustSucceed: true,
+    );
+    await runProcess(
+      'git',
+      <String>['checkout', _revision],
+      workingDirectory: environment.webUiGoldensRepositoryDirectory.path,
+      mustSucceed: true,
+    );
+  }
+
+  Future<String> _getLocalRevision() async {
+    final io.File head = io.File(path.join(
+      environment.webUiGoldensRepositoryDirectory.path, '.git', 'HEAD'
+    ));
+
+    if (!head.existsSync()) {
+      return null;
+    }
+
+    return head.readAsStringSync().trim();
+  }
+}
diff --git a/lib/web_ui/dev/goldens_lock.yaml b/lib/web_ui/dev/goldens_lock.yaml
new file mode 100644
index 0000000000000000000000000000000000000000..1b72c1367e6bf0d17664d5ab25e7145b27f650af
--- /dev/null
+++ b/lib/web_ui/dev/goldens_lock.yaml
@@ -0,0 +1,2 @@
+repository: https://github.com/flutter/goldens.git
+revision: dd993a32c23c5c542f083134467e7cda09cac975
diff --git a/lib/web_ui/dev/test_platform.dart b/lib/web_ui/dev/test_platform.dart
index 339e4fa0bc18fd4fbc7f432256bdf0dab83604d4..ab2c08c675d92e0b9c4e805a7724ee886242a1ba 100644
--- a/lib/web_ui/dev/test_platform.dart
+++ b/lib/web_ui/dev/test_platform.dart
@@ -147,10 +147,28 @@ class BrowserPlatform extends PlatformPlugin {
   }
 
   Future<String> _diffScreenshot(String filename, bool write, [ Map<String, dynamic> region ]) async {
-    const String _kGoldensDirectory = 'test/golden_files';
+    String goldensDirectory;
+    if (filename.startsWith('__local__')) {
+      filename = filename.substring('__local__/'.length);
+      goldensDirectory = p.join(
+        env.environment.webUiRootDir.path,
+        'test',
+        'golden_files',
+      );
+    } else {
+      await fetchGoldens();
+      goldensDirectory = p.join(
+        env.environment.webUiGoldensRepositoryDirectory.path,
+        'engine',
+        'web',
+      );
+    }
 
     // Bail out fast if golden doesn't exist, and user doesn't want to create it.
-    final File file = File(p.join(_kGoldensDirectory, filename));
+    final File file = File(p.join(
+      goldensDirectory,
+      filename,
+    ));
     if (!file.existsSync() && !write) {
       return '''
 Golden file $filename does not exist.
diff --git a/lib/web_ui/dev/utils.dart b/lib/web_ui/dev/utils.dart
index 9078648fb9feb7034658a34d4e3ea8d7754c97e4..e44909c8cdc18bf6bd7cabe92f73fa8f6c751e20 100644
--- a/lib/web_ui/dev/utils.dart
+++ b/lib/web_ui/dev/utils.dart
@@ -5,6 +5,7 @@
 import 'dart:async';
 import 'dart:io' as io;
 
+import 'package:meta/meta.dart';
 import 'package:path/path.dart' as path;
 
 import 'environment.dart';
@@ -31,17 +32,54 @@ class FilePath {
   String toString() => _absolutePath;
 }
 
+/// Runs [executable] merging its output into the current process' standard out and standard error.
 Future<int> runProcess(
   String executable,
   List<String> arguments, {
   String workingDirectory,
+  bool mustSucceed: false,
 }) async {
   final io.Process process = await io.Process.start(
     executable,
     arguments,
     workingDirectory: workingDirectory,
   );
-  return _forwardIOAndWait(process);
+  final int exitCode = await _forwardIOAndWait(process);
+  if (mustSucceed && exitCode != 0) {
+    throw ProcessException(
+      description: 'Sub-process failed.',
+      executable: executable,
+      arguments: arguments,
+      workingDirectory: workingDirectory,
+      exitCode: exitCode,
+    );
+  }
+  return exitCode;
+}
+
+/// Runs [executable] and returns its standard output as a string.
+///
+/// If the process fails, throws a [ProcessException].
+Future<String> evalProcess(
+  String executable,
+  List<String> arguments, {
+  String workingDirectory,
+}) async {
+  final io.ProcessResult result = await io.Process.run(
+    executable,
+    arguments,
+    workingDirectory: workingDirectory,
+  );
+  if (result.exitCode != 0) {
+    throw ProcessException(
+      description: result.stderr,
+      executable: executable,
+      arguments: arguments,
+      workingDirectory: workingDirectory,
+      exitCode: result.exitCode,
+    );
+  }
+  return result.stdout;
 }
 
 Future<int> _forwardIOAndWait(io.Process process) {
@@ -53,3 +91,31 @@ Future<int> _forwardIOAndWait(io.Process process) {
     return exitCode;
   });
 }
+
+@immutable
+class ProcessException implements Exception {
+  ProcessException({
+    @required this.description,
+    @required this.executable,
+    @required this.arguments,
+    @required this.workingDirectory,
+    @required this.exitCode,
+  });
+
+  final String description;
+  final String executable;
+  final List<String> arguments;
+  final String workingDirectory;
+  final int exitCode;
+
+  @override
+  String toString() {
+    final StringBuffer message = StringBuffer();
+    message
+      ..writeln(description)
+      ..writeln('Command: $executable ${arguments.join(' ')}')
+      ..writeln('Working directory: ${workingDirectory ?? io.Directory.current.path}')
+      ..writeln('Exit code: $exitCode');
+    return '$message';
+  }
+}
diff --git a/lib/web_ui/test/golden_files/engine/bitmap_canvas_fills_color_when_transformed.png b/lib/web_ui/test/golden_files/engine/bitmap_canvas_fills_color_when_transformed.png
deleted file mode 100644
index 899fdbbfa892091c809c35192e7fcfd89e757642..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/bitmap_canvas_fills_color_when_transformed.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/bitmap_canvas_fills_paint_when_transformed.png b/lib/web_ui/test/golden_files/engine/bitmap_canvas_fills_paint_when_transformed.png
deleted file mode 100644
index 8c868e0286349914a604264cab997cc2f75e17ea..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/bitmap_canvas_fills_paint_when_transformed.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/canvas_drrect_overlapping_radius.png b/lib/web_ui/test/golden_files/engine/canvas_drrect_overlapping_radius.png
deleted file mode 100644
index 2a81d5d98c9597b236d6dd79401d9bee1929894a..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/canvas_drrect_overlapping_radius.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/canvas_rrect_overlapping_radius.png b/lib/web_ui/test/golden_files/engine/canvas_rrect_overlapping_radius.png
deleted file mode 100644
index 1a9fffd5b21d7b4ec310cf04baa0297a0393d70a..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/canvas_rrect_overlapping_radius.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/canvas_rrect_round_square.png b/lib/web_ui/test/golden_files/engine/canvas_rrect_round_square.png
deleted file mode 100644
index 1ab3e710d3ea235162744ab6d3d5fe64d2df600b..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/canvas_rrect_round_square.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/compositing_3d_rotate1.png b/lib/web_ui/test/golden_files/engine/compositing_3d_rotate1.png
deleted file mode 100644
index e0830c26372c7924153c2b2a3bd0c762cba285e0..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/compositing_3d_rotate1.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/compositing_clip_path.png b/lib/web_ui/test/golden_files/engine/compositing_clip_path.png
deleted file mode 100644
index e788891ea48f0806bc793bbc77dba1f23c982f0f..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/compositing_clip_path.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/compositing_clip_rect_with_offset_and_transform.png b/lib/web_ui/test/golden_files/engine/compositing_clip_rect_with_offset_and_transform.png
deleted file mode 100644
index d4a4076f9efa9647c722aad12d396da8a2724910..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/compositing_clip_rect_with_offset_and_transform.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/compositing_cull_rect_fills_layer_clip.png b/lib/web_ui/test/golden_files/engine/compositing_cull_rect_fills_layer_clip.png
deleted file mode 100644
index b487f7ccd797069ed42392f6ec293d4c2507f2a8..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/compositing_cull_rect_fills_layer_clip.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/compositing_cull_rect_intersects_clip_and_paint_bounds.png b/lib/web_ui/test/golden_files/engine/compositing_cull_rect_intersects_clip_and_paint_bounds.png
deleted file mode 100644
index e9f7e740305a2803ff6c5c1fe85c8a8e61ac221b..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/compositing_cull_rect_intersects_clip_and_paint_bounds.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/compositing_cull_rect_offset_inside_layer_clip.png b/lib/web_ui/test/golden_files/engine/compositing_cull_rect_offset_inside_layer_clip.png
deleted file mode 100644
index 1086382463ac15972c662ff607e362427321aee7..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/compositing_cull_rect_offset_inside_layer_clip.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/compositing_cull_rect_rotated.png b/lib/web_ui/test/golden_files/engine/compositing_cull_rect_rotated.png
deleted file mode 100644
index ff42ce368c230101a851dee5da6e97767a801b96..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/compositing_cull_rect_rotated.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/compositing_shifted_clip_rect.png b/lib/web_ui/test/golden_files/engine/compositing_shifted_clip_rect.png
deleted file mode 100644
index 89f95faa35f4502df97a033d874bdcafe96d06d9..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/compositing_shifted_clip_rect.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/compositing_shifted_clip_rrect.png b/lib/web_ui/test/golden_files/engine/compositing_shifted_clip_rrect.png
deleted file mode 100644
index e585e3a650b783f2512e4ca8a8422c2d2a5ae5be..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/compositing_shifted_clip_rrect.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/compositing_shifted_physical_shape_clip.png b/lib/web_ui/test/golden_files/engine/compositing_shifted_physical_shape_clip.png
deleted file mode 100644
index a5f776bb1a4bc46d5c76d36236ec5f7b33690197..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/compositing_shifted_physical_shape_clip.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/misaligned_canvas_test.png b/lib/web_ui/test/golden_files/engine/misaligned_canvas_test.png
deleted file mode 100644
index ab137f0d9f8175486b1c17fa9d2ffb2966038bd5..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/misaligned_canvas_test.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/misaligned_pixels_in_canvas_test.png b/lib/web_ui/test/golden_files/engine/misaligned_pixels_in_canvas_test.png
deleted file mode 100644
index ab137f0d9f8175486b1c17fa9d2ffb2966038bd5..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/misaligned_pixels_in_canvas_test.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_path.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_path.png
deleted file mode 100644
index 747da6a859561bde316f72da30cddbd866e16604..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_path.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_path_BitmapCanvas+canvas_measurement.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_path_BitmapCanvas+canvas_measurement.png
deleted file mode 100644
index 7fe1a60c4feda007356ab9fc350f0df0c42ff727..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_path_BitmapCanvas+canvas_measurement.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_path_BitmapCanvas.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_path_BitmapCanvas.png
deleted file mode 100644
index 7fe1a60c4feda007356ab9fc350f0df0c42ff727..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_path_BitmapCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_path_HoudiniCanvas.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_path_HoudiniCanvas.png
deleted file mode 100644
index d8284f456c9c2c6dbdb0349ab9b2b65905ab09fc..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_path_HoudiniCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect.png
deleted file mode 100644
index b1448461a89d60b1dee0087a0c892360d1be5cd2..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_BitmapCanvas+canvas_measurement.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_BitmapCanvas+canvas_measurement.png
deleted file mode 100644
index dbb6ed4b3cffa44529162d1663ca5bef72660977..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_BitmapCanvas+canvas_measurement.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_BitmapCanvas.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_BitmapCanvas.png
deleted file mode 100644
index dbb6ed4b3cffa44529162d1663ca5bef72660977..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_BitmapCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_HoudiniCanvas.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_HoudiniCanvas.png
deleted file mode 100644
index ef66da5e2a9f4c5dc27c1cb7fd8bf946ed2a8d7c..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_HoudiniCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_translate.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_translate.png
deleted file mode 100644
index 02f111fefcb747955c020d7a9c2beff6ec6a8bf2..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_translate.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_translate_BitmapCanvas+canvas_measurement.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_translate_BitmapCanvas+canvas_measurement.png
deleted file mode 100644
index 1ba8bfbeb47c157587e5804c326f2de985398c14..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_translate_BitmapCanvas+canvas_measurement.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_translate_BitmapCanvas.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_translate_BitmapCanvas.png
deleted file mode 100644
index 1ba8bfbeb47c157587e5804c326f2de985398c14..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_translate_BitmapCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_translate_HoudiniCanvas.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_translate_HoudiniCanvas.png
deleted file mode 100644
index d88dbaa4ce0fcc8b0a6a090cb0e870516544dd48..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_rect_translate_HoudiniCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_roundrect.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_roundrect.png
deleted file mode 100644
index afd6cfedf95e08cc626b48af7c8aa80d835fc347..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_roundrect.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_roundrect_BitmapCanvas+canvas_measurement.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_roundrect_BitmapCanvas+canvas_measurement.png
deleted file mode 100644
index 951f9fb1ca4bd2e64d0a5ccb27fa8994bb2fdee4..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_roundrect_BitmapCanvas+canvas_measurement.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_roundrect_BitmapCanvas.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_roundrect_BitmapCanvas.png
deleted file mode 100644
index 9585084d42ed76d34fecce7a488c61bb7ad8a770..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_roundrect_BitmapCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_roundrect_HoudiniCanvas.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_roundrect_HoudiniCanvas.png
deleted file mode 100644
index afa820b84ce660397ea9fff7b84d9a918452db96..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_roundrect_HoudiniCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_stack1.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_stack1.png
deleted file mode 100644
index e6812a18c998f29d587a2882bc07b1926daec609..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_stack1.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_stack1_BitmapCanvas+canvas_measurement.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_stack1_BitmapCanvas+canvas_measurement.png
deleted file mode 100644
index 1d9612f568abe02091816d8ad983146c22d78fa7..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_stack1_BitmapCanvas+canvas_measurement.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_stack1_BitmapCanvas.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_stack1_BitmapCanvas.png
deleted file mode 100644
index 390a9b5c967776178bcd85a351652747b17c5291..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_stack1_BitmapCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_stack1_HoudiniCanvas.png b/lib/web_ui/test/golden_files/engine/multiline_text_clipping_stack1_HoudiniCanvas.png
deleted file mode 100644
index cdcff01b07297917c2542d960683d9e1b616094f..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/multiline_text_clipping_stack1_HoudiniCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rect_intersects_paint_left_to_right.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rect_intersects_paint_left_to_right.png
deleted file mode 100644
index 519ea934f63b825ab2cdacdf2dcca8383f2be51e..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rect_intersects_paint_left_to_right.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rect_intersects_paint_top_to_bottom.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rect_intersects_paint_top_to_bottom.png
deleted file mode 100644
index af9b8a67e36b00df53fa5e64d4e316c8d03cdaff..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rect_intersects_paint_top_to_bottom.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rect_rotated.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rect_rotated.png
deleted file mode 100644
index 201eb2f9bfa51fa00d36d07ee4e95f47b304723b..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rect_rotated.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rect_simple.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rect_simple.png
deleted file mode 100644
index f610e9b11d8ebea893e526afe9270de9a82cea90..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rect_simple.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rects_intersect.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rects_intersect.png
deleted file mode 100644
index 3b47f116110fcef6ed5846a97303f9a6db063ac6..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_clip_rects_intersect.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_complex_transform.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_complex_transform.png
deleted file mode 100644
index c6057629e56cbc6d480fe4504e2c8fc83e15bde6..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_complex_transform.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_circle.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_circle.png
deleted file mode 100644
index a4b5a13ba94cb4301df5ff0f2ae5e28806a52f26..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_circle.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_color.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_color.png
deleted file mode 100644
index 6e9b4a45bf10456dfddb296b69885690d7305c8c..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_color.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_drrect.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_drrect.png
deleted file mode 100644
index 04fdfee6e767b9572659cab9d100830637cda8a4..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_drrect.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_drrect_empty.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_drrect_empty.png
deleted file mode 100644
index dad6fb69e2c4008af88775f0f01bab4732fdffa6..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_drrect_empty.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_line.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_line.png
deleted file mode 100644
index d966856dca6ef5d48b057645e567181e6851412c..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_line.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_line_exceeding_limits.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_line_exceeding_limits.png
deleted file mode 100644
index 64ec011396a6beae04fe4130d40236579381277c..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_line_exceeding_limits.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_oval.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_oval.png
deleted file mode 100644
index 86123f08954f2dfc421f41bd6229738168b30aa8..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_oval.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_paint.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_paint.png
deleted file mode 100644
index ba2a222adbbfbbaa7c70e9ce9f08a66dc605f1b4..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_paint.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_paragraph.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_paragraph.png
deleted file mode 100644
index 7af503c5ced674c878354cd9aa954e1b891b6497..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_paragraph.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_paragraph_multi_line.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_paragraph_multi_line.png
deleted file mode 100644
index 5546e3a0686397ffdfd3d3ed56aa3f9bb03fc009..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_paragraph_multi_line.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_rect.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_rect.png
deleted file mode 100644
index 4e5e2b9cef443889b07865ebb1f1689c632b66a3..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_rect.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_rect_exceeding_limits.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_rect_exceeding_limits.png
deleted file mode 100644
index a2e0ff534afef6dcb574638824aa377226994209..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_rect_exceeding_limits.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_round_rect.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_round_rect.png
deleted file mode 100644
index adab8ea3b1b280a811a6c5b6e49e481dd266c22a..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_draw_round_rect.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_empty_canvas.diff..png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_empty_canvas.diff..png
deleted file mode 100644
index 7c2624a6b9687e88178638cd95b609c329177ade..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_empty_canvas.diff..png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_empty_canvas.out..png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_empty_canvas.out..png
deleted file mode 100644
index 2cef4d1d4257723552b4966cad18bc76578c90c8..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_empty_canvas.out..png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_empty_canvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_empty_canvas.png
deleted file mode 100644
index dad6fb69e2c4008af88775f0f01bab4732fdffa6..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_empty_canvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_line_rotated.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_line_rotated.png
deleted file mode 100644
index e7ee55e49a81e50b8e66f82e4a0227f51a777604..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_line_rotated.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_path_with_line_and_roundrect.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_path_with_line_and_roundrect.png
deleted file mode 100644
index 873419f1b6b16eb8a6100efb786adf6a3892a0e6..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_path_with_line_and_roundrect.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_path_with_shadow.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_path_with_shadow.png
deleted file mode 100644
index c02314d98191e0e31bcd9f614af63526b92fc027..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_path_with_shadow.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_reuse_path.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_reuse_path.png
deleted file mode 100644
index 058268ba77fb83976ef5835b861557103ea27c22..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_reuse_path.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_rotate.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_rotate.png
deleted file mode 100644
index c81838d4a7f616569e2249efe06ac29ecaac660d..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_rotate.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_scale.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_scale.png
deleted file mode 100644
index 073d3b7733d0cc2c23577195b9ac2458ebc92d9a..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_scale.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_scale_negative.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_scale_negative.png
deleted file mode 100644
index 009d409baf15fca2e677e4afe97d582e662eb471..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_scale_negative.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_skew_horizontally.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_skew_horizontally.png
deleted file mode 100644
index 8202a973f90f7649768ef57d925723f4306b8291..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_skew_horizontally.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_skew_vertically.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_skew_vertically.png
deleted file mode 100644
index 259b1a2e7018cdf80b9cc4f9a0d850477334f91c..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_skew_vertically.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_BitmapCanvas+canvas_measurement.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_BitmapCanvas+canvas_measurement.png
deleted file mode 100644
index ef2d87bd14a3fa550df9c9ed443bd9bd70940a47..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_BitmapCanvas+canvas_measurement.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_BitmapCanvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_BitmapCanvas.png
deleted file mode 100644
index ef2d87bd14a3fa550df9c9ed443bd9bd70940a47..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_BitmapCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_DomCanvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_DomCanvas.png
deleted file mode 100644
index ef2d87bd14a3fa550df9c9ed443bd9bd70940a47..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_DomCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_HoudiniCanvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_HoudiniCanvas.png
deleted file mode 100644
index ef2d87bd14a3fa550df9c9ed443bd9bd70940a47..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_HoudiniCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_bitmap_canvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_bitmap_canvas.png
deleted file mode 100644
index cfd40afe7e1807062b5661e99d3b15592c7d04b2..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_bitmap_canvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_dom_canvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_dom_canvas.png
deleted file mode 100644
index cfd40afe7e1807062b5661e99d3b15592c7d04b2..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decorationStyle_dom_canvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_BitmapCanvas+canvas_measurement.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_BitmapCanvas+canvas_measurement.png
deleted file mode 100644
index 5de61ff7755b4219c8461795013f6296fe5f5bda..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_BitmapCanvas+canvas_measurement.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_BitmapCanvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_BitmapCanvas.png
deleted file mode 100644
index 5de61ff7755b4219c8461795013f6296fe5f5bda..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_BitmapCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_DomCanvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_DomCanvas.png
deleted file mode 100644
index 5de61ff7755b4219c8461795013f6296fe5f5bda..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_DomCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_HoudiniCanvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_HoudiniCanvas.png
deleted file mode 100644
index 5de61ff7755b4219c8461795013f6296fe5f5bda..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_HoudiniCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_bitmap_canvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_bitmap_canvas.png
deleted file mode 100644
index 4422a35b383a31d983d9a619209f1a0934851e38..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_bitmap_canvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_dom_canvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_dom_canvas.png
deleted file mode 100644
index 4422a35b383a31d983d9a619209f1a0934851e38..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_decoration_dom_canvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_BitmapCanvas+canvas_measurement.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_BitmapCanvas+canvas_measurement.png
deleted file mode 100644
index 48d765a83c2c51759f1970c33886c90b0eeac856..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_BitmapCanvas+canvas_measurement.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_BitmapCanvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_BitmapCanvas.png
deleted file mode 100644
index 48d765a83c2c51759f1970c33886c90b0eeac856..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_BitmapCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_DomCanvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_DomCanvas.png
deleted file mode 100644
index e8f8b62229666b139f980af6f65782f0c388b8e7..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_DomCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_HoudiniCanvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_HoudiniCanvas.png
deleted file mode 100644
index e8f8b62229666b139f980af6f65782f0c388b8e7..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_HoudiniCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_bitmap_canvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_bitmap_canvas.png
deleted file mode 100644
index 0ae6d64f1ad1acab455f00a14ad4ec82d0250fec..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_bitmap_canvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_dom_canvas.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_dom_canvas.png
deleted file mode 100644
index 0ae6d64f1ad1acab455f00a14ad4ec82d0250fec..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_text_style_letter_spacing_dom_canvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/paint_bounds_for_translate.png b/lib/web_ui/test/golden_files/engine/paint_bounds_for_translate.png
deleted file mode 100644
index 38bd638c1177bfbc84a2b3c8b339f2b3b0d05a30..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/paint_bounds_for_translate.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/render_conic_1_w10.png b/lib/web_ui/test/golden_files/engine/render_conic_1_w10.png
deleted file mode 100644
index 5bfe5ee87a1c139fd8b6e5f0321b3abf0b8e3e1e..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/render_conic_1_w10.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/render_conic_2.png b/lib/web_ui/test/golden_files/engine/render_conic_2.png
deleted file mode 100644
index b29dcaf7de3b6887ed0848a11704624cdce7840d..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/render_conic_2.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/render_conic_2_w10.png b/lib/web_ui/test/golden_files/engine/render_conic_2_w10.png
deleted file mode 100644
index 8ff94ced85708c8f49f3523d6e86ab76b85e086a..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/render_conic_2_w10.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/svg_arc_1.png b/lib/web_ui/test/golden_files/engine/svg_arc_1.png
deleted file mode 100644
index 1ff4e3548462cce4ecb5e62c415d83b5642f811d..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/svg_arc_1.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/svg_arc_2.png b/lib/web_ui/test/golden_files/engine/svg_arc_2.png
deleted file mode 100644
index 1a85983ace0a3e28a64fcdcb024b4978c54948cf..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/svg_arc_2.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/svg_arc_3.png b/lib/web_ui/test/golden_files/engine/svg_arc_3.png
deleted file mode 100644
index 82b52a8e94922ab1799540fdedf9df9ab9234d27..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/svg_arc_3.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/svg_arc_4.png b/lib/web_ui/test/golden_files/engine/svg_arc_4.png
deleted file mode 100644
index 985ffab0356b935936ef5445bfbf7364bd520bcf..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/svg_arc_4.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/svg_arc_5.png b/lib/web_ui/test/golden_files/engine/svg_arc_5.png
deleted file mode 100644
index 8ea3b1aecd1f8ac7b212ce76aae6e34d9e59629d..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/svg_arc_5.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/svg_arc_6.png b/lib/web_ui/test/golden_files/engine/svg_arc_6.png
deleted file mode 100644
index d81b3669806e12ceb8266a49a3de15ee28cd8c60..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/svg_arc_6.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/svg_arc_7.png b/lib/web_ui/test/golden_files/engine/svg_arc_7.png
deleted file mode 100644
index d5755f25a040631fbd4125a7aadb337a89b773d6..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/svg_arc_7.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/svg_arc_8.png b/lib/web_ui/test/golden_files/engine/svg_arc_8.png
deleted file mode 100644
index 5c05e9d2e0eace4af11330586daf02696d2e9299..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/svg_arc_8.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/svg_cubic_bezier.png b/lib/web_ui/test/golden_files/engine/svg_cubic_bezier.png
deleted file mode 100644
index f542c87ccd4cb91d5d37a920f470dc48713643de..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/svg_cubic_bezier.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/svg_notch.png b/lib/web_ui/test/golden_files/engine/svg_notch.png
deleted file mode 100644
index ae349ea6138185101d4ec749019036a34bc793b4..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/svg_notch.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/svg_quad_bezier.png b/lib/web_ui/test/golden_files/engine/svg_quad_bezier.png
deleted file mode 100644
index 96c2968b9d38e6f3c5b71282760d0d3e1478e2e7..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/svg_quad_bezier.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/svg_rect.png b/lib/web_ui/test/golden_files/engine/svg_rect.png
deleted file mode 100644
index ab11db65cc76fca0911326bb2ed16b2903b573e7..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/svg_rect.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/svg_stroke_line.png b/lib/web_ui/test/golden_files/engine/svg_stroke_line.png
deleted file mode 100644
index 442e424dd53b359f3f4caaa5089d4828e7d3a4da..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/svg_stroke_line.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/text_background_BitmapCanvas+canvas_measurement.png b/lib/web_ui/test/golden_files/engine/text_background_BitmapCanvas+canvas_measurement.png
deleted file mode 100644
index d95233f0dacab80b10a003cc62a7ba5f3619483b..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/text_background_BitmapCanvas+canvas_measurement.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/text_background_BitmapCanvas.png b/lib/web_ui/test/golden_files/engine/text_background_BitmapCanvas.png
deleted file mode 100644
index d95233f0dacab80b10a003cc62a7ba5f3619483b..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/text_background_BitmapCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/text_background_DomCanvas.png b/lib/web_ui/test/golden_files/engine/text_background_DomCanvas.png
deleted file mode 100644
index d95233f0dacab80b10a003cc62a7ba5f3619483b..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/text_background_DomCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/text_background_HoudiniCanvas.png b/lib/web_ui/test/golden_files/engine/text_background_HoudiniCanvas.png
deleted file mode 100644
index d95233f0dacab80b10a003cc62a7ba5f3619483b..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/text_background_HoudiniCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/text_long_unbreakable_BitmapCanvas+canvas_measurement.png b/lib/web_ui/test/golden_files/engine/text_long_unbreakable_BitmapCanvas+canvas_measurement.png
deleted file mode 100644
index 3b8d47fdb9cde2c8685b7d947a3a3ad24bfba4fd..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/text_long_unbreakable_BitmapCanvas+canvas_measurement.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/text_long_unbreakable_BitmapCanvas.png b/lib/web_ui/test/golden_files/engine/text_long_unbreakable_BitmapCanvas.png
deleted file mode 100644
index 5ade579f73c19772e0f2852e2e9990f4c0a18516..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/text_long_unbreakable_BitmapCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/text_long_unbreakable_DomCanvas.png b/lib/web_ui/test/golden_files/engine/text_long_unbreakable_DomCanvas.png
deleted file mode 100644
index 69f12679b58ec107dec904cd5727ce9b12b63076..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/text_long_unbreakable_DomCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/text_long_unbreakable_HoudiniCanvas.png b/lib/web_ui/test/golden_files/engine/text_long_unbreakable_HoudiniCanvas.png
deleted file mode 100644
index 69f12679b58ec107dec904cd5727ce9b12b63076..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/text_long_unbreakable_HoudiniCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/text_max_lines_BitmapCanvas+canvas_measurement.png b/lib/web_ui/test/golden_files/engine/text_max_lines_BitmapCanvas+canvas_measurement.png
deleted file mode 100644
index a73483c792e0cbd6e2476373d75208c411a6fbcb..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/text_max_lines_BitmapCanvas+canvas_measurement.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/text_max_lines_BitmapCanvas.png b/lib/web_ui/test/golden_files/engine/text_max_lines_BitmapCanvas.png
deleted file mode 100644
index f1dab492eaac3fbdb391416ffec8c663e0e67f46..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/text_max_lines_BitmapCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/text_max_lines_DomCanvas.png b/lib/web_ui/test/golden_files/engine/text_max_lines_DomCanvas.png
deleted file mode 100644
index f1dab492eaac3fbdb391416ffec8c663e0e67f46..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/text_max_lines_DomCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/text_max_lines_HoudiniCanvas.png b/lib/web_ui/test/golden_files/engine/text_max_lines_HoudiniCanvas.png
deleted file mode 100644
index f1dab492eaac3fbdb391416ffec8c663e0e67f46..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/text_max_lines_HoudiniCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/text_max_lines_with_ellipsis_BitmapCanvas+canvas_measurement.png b/lib/web_ui/test/golden_files/engine/text_max_lines_with_ellipsis_BitmapCanvas+canvas_measurement.png
deleted file mode 100644
index fef28b40ffa5dce36690be52320c3d13e96742c9..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/text_max_lines_with_ellipsis_BitmapCanvas+canvas_measurement.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/text_max_lines_with_ellipsis_BitmapCanvas.png b/lib/web_ui/test/golden_files/engine/text_max_lines_with_ellipsis_BitmapCanvas.png
deleted file mode 100644
index 307f89bfcf3681fe91873faa64a593c73be49092..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/text_max_lines_with_ellipsis_BitmapCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/text_max_lines_with_ellipsis_DomCanvas.png b/lib/web_ui/test/golden_files/engine/text_max_lines_with_ellipsis_DomCanvas.png
deleted file mode 100644
index 307f89bfcf3681fe91873faa64a593c73be49092..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/text_max_lines_with_ellipsis_DomCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_files/engine/text_max_lines_with_ellipsis_HoudiniCanvas.png b/lib/web_ui/test/golden_files/engine/text_max_lines_with_ellipsis_HoudiniCanvas.png
deleted file mode 100644
index 307f89bfcf3681fe91873faa64a593c73be49092..0000000000000000000000000000000000000000
Binary files a/lib/web_ui/test/golden_files/engine/text_max_lines_with_ellipsis_HoudiniCanvas.png and /dev/null differ
diff --git a/lib/web_ui/test/golden_tests/engine/canvas_rrect_scuba_test.dart b/lib/web_ui/test/golden_tests/engine/canvas_rrect_scuba_test.dart
index 8d51d677599eb9c2dc00cf2dc415b5e702df679c..78e2ddd50808d83d2bfabb0d942ac24ce210a35c 100644
--- a/lib/web_ui/test/golden_tests/engine/canvas_rrect_scuba_test.dart
+++ b/lib/web_ui/test/golden_tests/engine/canvas_rrect_scuba_test.dart
@@ -42,7 +42,7 @@ void main() async {
     }
 
     html.document.body.append(canvas.rootElement);
-    await matchGoldenFile('engine/canvas_rrect_round_square.png', region: region);
+    await matchGoldenFile('canvas_rrect_round_square.png', region: region);
   }, timeout: const Timeout(Duration(seconds: 10)));
 
   test('round rect with big radius scale down smaller radius', () async {
@@ -58,7 +58,7 @@ void main() async {
     }
 
     html.document.body.append(canvas.rootElement);
-    await matchGoldenFile('engine/canvas_rrect_overlapping_radius.png', region: region);
+    await matchGoldenFile('canvas_rrect_overlapping_radius.png', region: region);
   }, timeout: const Timeout(Duration(seconds: 10)));
 
   test('diff round rect with big radius scale down smaller radius', () async {
@@ -81,6 +81,6 @@ void main() async {
     }
 
     html.document.body.append(canvas.rootElement);
-    await matchGoldenFile('engine/canvas_drrect_overlapping_radius.png', region: region);
+    await matchGoldenFile('canvas_drrect_overlapping_radius.png', region: region);
   }, timeout: const Timeout(Duration(seconds: 10)));
 }
diff --git a/lib/web_ui/test/golden_tests/engine/canvas_scuba_test.dart b/lib/web_ui/test/golden_tests/engine/canvas_scuba_test.dart
index 8fbddf0553ad2ef7b66bd8e659489c176cb2665a..4c7986e2bbe71aa2c0c11f4d0dfb4b729d23deac 100644
--- a/lib/web_ui/test/golden_tests/engine/canvas_scuba_test.dart
+++ b/lib/web_ui/test/golden_tests/engine/canvas_scuba_test.dart
@@ -68,7 +68,7 @@ void main() async {
 
     html.document.body.append(canvas.rootElement);
 
-    await matchGoldenFile('engine/misaligned_pixels_in_canvas_test.png', region: region);
+    await matchGoldenFile('misaligned_pixels_in_canvas_test.png', region: region);
   }, timeout: const Timeout(Duration(seconds: 10)));
 
   test('compensates for misalignment of the canvas', () async {
@@ -83,7 +83,7 @@ void main() async {
 
     html.document.body.append(canvas.rootElement);
 
-    await matchGoldenFile('engine/misaligned_canvas_test.png', region: region);
+    await matchGoldenFile('misaligned_canvas_test.png', region: region);
   }, timeout: const Timeout(Duration(seconds: 10)));
 
   test('fill the whole canvas with color even when transformed', () async {
@@ -94,7 +94,7 @@ void main() async {
 
     html.document.body.append(canvas.rootElement);
 
-    await matchGoldenFile('engine/bitmap_canvas_fills_color_when_transformed.png', region: region);
+    await matchGoldenFile('bitmap_canvas_fills_color_when_transformed.png', region: region);
   }, timeout: const Timeout(Duration(seconds: 10)));
 
   test('fill the whole canvas with paint even when transformed', () async {
@@ -107,6 +107,6 @@ void main() async {
 
     html.document.body.append(canvas.rootElement);
 
-    await matchGoldenFile('engine/bitmap_canvas_fills_paint_when_transformed.png', region: region);
+    await matchGoldenFile('bitmap_canvas_fills_paint_when_transformed.png', region: region);
   }, timeout: const Timeout(Duration(seconds: 10)));
 }
diff --git a/lib/web_ui/test/golden_tests/engine/compositing_scuba_test.dart b/lib/web_ui/test/golden_tests/engine/compositing_scuba_test.dart
index 148660ff78e78e91f4806a7c9472f1744c5df9ed..caed73a7f8cfc14479d84c05cb6f55ea70c91db8 100644
--- a/lib/web_ui/test/golden_tests/engine/compositing_scuba_test.dart
+++ b/lib/web_ui/test/golden_tests/engine/compositing_scuba_test.dart
@@ -34,7 +34,7 @@ void main() async {
 
     html.document.body.append(builder.build().webOnlyRootElement);
 
-    await matchGoldenFile('engine/compositing_shifted_clip_rect.png', region: region);
+    await matchGoldenFile('compositing_shifted_clip_rect.png', region: region);
   }, timeout: const Timeout(Duration(seconds: 10)));
 
   test('pushClipRect with offset and transform', () async {
@@ -54,7 +54,7 @@ void main() async {
 
     html.document.body.append(builder.build().webOnlyRootElement);
 
-    await matchGoldenFile('engine/compositing_clip_rect_with_offset_and_transform.png', region: region);
+    await matchGoldenFile('compositing_clip_rect_with_offset_and_transform.png', region: region);
   }, timeout: const Timeout(Duration(seconds: 10)));
 
   test('pushClipRRect', () async {
@@ -67,7 +67,7 @@ void main() async {
 
     html.document.body.append(builder.build().webOnlyRootElement);
 
-    await matchGoldenFile('engine/compositing_shifted_clip_rrect.png', region: region);
+    await matchGoldenFile('compositing_shifted_clip_rrect.png', region: region);
   }, timeout: const Timeout(Duration(seconds: 10)));
 
   test('pushPhysicalShape', () async {
@@ -95,7 +95,7 @@ void main() async {
 
     html.document.body.append(builder.build().webOnlyRootElement);
 
-    await matchGoldenFile('engine/compositing_shifted_physical_shape_clip.png', region: region);
+    await matchGoldenFile('compositing_shifted_physical_shape_clip.png', region: region);
   }, timeout: const Timeout(Duration(seconds: 10)));
 
   group('Cull rect computation', () {
@@ -222,7 +222,7 @@ void _testCullRectComputation() {
     builder.pop(); // pushClipRect
     html.document.body.append(builder.build().webOnlyRootElement);
 
-    await matchGoldenFile('engine/compositing_cull_rect_fills_layer_clip.png', region: region);
+    await matchGoldenFile('compositing_cull_rect_fills_layer_clip.png', region: region);
 
     final PersistedStandardPicture picture = enumeratePictures().single;
     expect(picture.optimalLocalCullRect, const Rect.fromLTRB(40, 40, 70, 70));
@@ -250,7 +250,7 @@ void _testCullRectComputation() {
     builder.pop(); // pushClipRect
     html.document.body.append(builder.build().webOnlyRootElement);
 
-    await matchGoldenFile('engine/compositing_cull_rect_intersects_clip_and_paint_bounds.png', region: region);
+    await matchGoldenFile('compositing_cull_rect_intersects_clip_and_paint_bounds.png', region: region);
 
     final PersistedStandardPicture picture = enumeratePictures().single;
     expect(picture.optimalLocalCullRect, const Rect.fromLTRB(50, 40, 70, 70));
@@ -280,7 +280,7 @@ void _testCullRectComputation() {
     builder.pop(); // pushClipRect
     html.document.body.append(builder.build().webOnlyRootElement);
 
-    await matchGoldenFile('engine/compositing_cull_rect_offset_inside_layer_clip.png', region: region);
+    await matchGoldenFile('compositing_cull_rect_offset_inside_layer_clip.png', region: region);
 
     final PersistedStandardPicture picture = enumeratePictures().single;
     expect(picture.optimalLocalCullRect,
@@ -353,7 +353,7 @@ void _testCullRectComputation() {
     builder.pop(); // pushOffset
     html.document.body.append(builder.build().webOnlyRootElement);
 
-    await matchGoldenFile('engine/compositing_cull_rect_rotated.png', region: region);
+    await matchGoldenFile('compositing_cull_rect_rotated.png', region: region);
 
     final PersistedStandardPicture picture = enumeratePictures().single;
     expect(
@@ -375,7 +375,7 @@ void _testCullRectComputation() {
 
     html.document.body.append(builder.build().webOnlyRootElement);
 
-    await matchGoldenFile('engine/compositing_clip_path.png', region: region);
+    await matchGoldenFile('compositing_clip_path.png', region: region);
   }, timeout: const Timeout(Duration(seconds: 10)));
 
   // Draw a picture inside a rotated clip. Verify that the cull rect is big
@@ -477,7 +477,7 @@ void _testCullRectComputation() {
     builder.pop(); // pushTransform scale
     html.document.body.append(builder.build().webOnlyRootElement);
 
-    await matchGoldenFile('engine/compositing_3d_rotate1.png', region: region);
+    await matchGoldenFile('compositing_3d_rotate1.png', region: region);
 
     final PersistedStandardPicture picture = enumeratePictures().single;
     // TODO(https://github.com/flutter/flutter/issues/40395):
diff --git a/lib/web_ui/test/golden_tests/engine/conic_scuba_test.dart b/lib/web_ui/test/golden_tests/engine/conic_scuba_test.dart
index 3a27a3d0dbea97d939a08b756301730a35b2f875..452b32acffdb8de6c13392ce8c4778b16058dfa2 100644
--- a/lib/web_ui/test/golden_tests/engine/conic_scuba_test.dart
+++ b/lib/web_ui/test/golden_tests/engine/conic_scuba_test.dart
@@ -33,7 +33,7 @@ void main() async {
 
     html.document.body.append(bitmapCanvas.rootElement);
     canvas.apply(bitmapCanvas);
-    await matchGoldenFile('engine/$scubaFileName.png', region: region);
+    await matchGoldenFile('$scubaFileName.png', region: region);
     bitmapCanvas.rootElement.remove();
   }
 
diff --git a/lib/web_ui/test/golden_tests/engine/path_to_svg_scuba_test.dart b/lib/web_ui/test/golden_tests/engine/path_to_svg_scuba_test.dart
index 7abe5ca0c3610b0d4645372771fc92364981b816..590cc8fe3ab9d9c38d0ab78353c4c913848a2a35 100644
--- a/lib/web_ui/test/golden_tests/engine/path_to_svg_scuba_test.dart
+++ b/lib/web_ui/test/golden_tests/engine/path_to_svg_scuba_test.dart
@@ -38,7 +38,7 @@ void main() async {
 
     canvas.apply(bitmapCanvas);
 
-    await matchGoldenFile('engine/$scubaFileName.png', region: region);
+    await matchGoldenFile('$scubaFileName.png', region: region);
 
     bitmapCanvas.rootElement.remove();
     svgElement.remove();
diff --git a/lib/web_ui/test/golden_tests/engine/recording_canvas_scuba_test.dart b/lib/web_ui/test/golden_tests/engine/recording_canvas_scuba_test.dart
index d439ed70ee2de60820efdf9065e8836dd36cded4..b529acadc6078d38c19826cd155a13389ced8460 100644
--- a/lib/web_ui/test/golden_tests/engine/recording_canvas_scuba_test.dart
+++ b/lib/web_ui/test/golden_tests/engine/recording_canvas_scuba_test.dart
@@ -44,7 +44,7 @@ void main() async {
     try {
       sceneElement.append(engineCanvas.rootElement);
       html.document.body.append(sceneElement);
-      await matchGoldenFile('engine/paint_bounds_for_$fileName.png', region: region);
+      await matchGoldenFile('paint_bounds_for_$fileName.png', region: region);
     } finally {
       // The page is reused across tests, so remove the element after taking the
       // Scuba screenshot.
diff --git a/lib/web_ui/test/golden_tests/engine/scuba.dart b/lib/web_ui/test/golden_tests/engine/scuba.dart
index d54d0925a77eafae25d1b8a18bd3c64be4170033..598daa11a5c3c71cb8e376f5c2e5325842ee0da0 100644
--- a/lib/web_ui/test/golden_tests/engine/scuba.dart
+++ b/lib/web_ui/test/golden_tests/engine/scuba.dart
@@ -40,7 +40,7 @@ class EngineScubaTester {
   }
 
   Future<void> diffScreenshot(String fileName) async {
-    await matchGoldenFile('engine/$fileName.png', region: ui.Rect.fromLTWH(0, 0, viewportSize.width, viewportSize.height));
+    await matchGoldenFile('$fileName.png', region: ui.Rect.fromLTWH(0, 0, viewportSize.width, viewportSize.height));
   }
 
   /// Prepares the DOM and inserts all the necessary nodes, then invokes scuba's
diff --git a/lib/web_ui/test/golden_tests/golden_failure_smoke_test.dart b/lib/web_ui/test/golden_tests/golden_failure_smoke_test.dart
index aef4845c93993084f876d0f5f5156dad73baad28..ddfa139452b833690853550cc14697401309e696 100644
--- a/lib/web_ui/test/golden_tests/golden_failure_smoke_test.dart
+++ b/lib/web_ui/test/golden_tests/golden_failure_smoke_test.dart
@@ -11,6 +11,6 @@ import 'package:web_engine_tester/golden_tester.dart';
 void main() {
   test('screenshot test reports failure', () async {
     html.document.body.innerHtml = 'Text that does not appear on the screenshot!';
-    await matchGoldenFile('smoke_test.png', region: Rect.fromLTWH(0, 0, 320, 200));
+    await matchGoldenFile('__local__/smoke_test.png', region: Rect.fromLTWH(0, 0, 320, 200));
   });
 }
diff --git a/lib/web_ui/test/golden_tests/golden_success_smoke_test.dart b/lib/web_ui/test/golden_tests/golden_success_smoke_test.dart
index 98c19d0c072cdab424969bf401c3854fa9cac956..c4366eb4310a79f29874d200c617585ede295110 100644
--- a/lib/web_ui/test/golden_tests/golden_success_smoke_test.dart
+++ b/lib/web_ui/test/golden_tests/golden_success_smoke_test.dart
@@ -11,6 +11,6 @@ import 'package:web_engine_tester/golden_tester.dart';
 void main() {
   test('screenshot test reports success', () async {
     html.document.body.innerHtml = 'Hello world!';
-    await matchGoldenFile('smoke_test.png', region: Rect.fromLTWH(0, 0, 320, 200));
+    await matchGoldenFile('__local__/smoke_test.png', region: Rect.fromLTWH(0, 0, 320, 200));
   });
 }