From 2d89ebb929bfa2809a46d032aab32988d1d536d2 Mon Sep 17 00:00:00 2001
From: Kate Lovett <katelovett@google.com>
Date: Mon, 3 May 2021 12:22:46 -0500
Subject: [PATCH] Revert "Fix benchmark (#81449)" (#81696)

This reverts commit a3893aea04743cca8d5a9e832d883cf2e15d99dc.
---
 .../macrobenchmarks/test_driver/animated_image_test.dart     | 2 +-
 dev/devicelab/bin/tasks/animated_image_gc_perf.dart          | 5 +----
 dev/devicelab/lib/tasks/perf_tests.dart                      | 2 --
 3 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/dev/benchmarks/macrobenchmarks/test_driver/animated_image_test.dart b/dev/benchmarks/macrobenchmarks/test_driver/animated_image_test.dart
index 3e1d85b505..f0e62af443 100644
--- a/dev/benchmarks/macrobenchmarks/test_driver/animated_image_test.dart
+++ b/dev/benchmarks/macrobenchmarks/test_driver/animated_image_test.dart
@@ -6,7 +6,7 @@ import 'package:flutter_driver/flutter_driver.dart';
 import 'package:test/test.dart' hide TypeMatcher, isInstanceOf;
 
 Future<void> main() async {
-  const String fileName = 'animated_image';
+  const String fileName = 'large_image_changer';
 
   test('Animate for 250 frames', () async {
     final FlutterDriver driver = await FlutterDriver.connect();
diff --git a/dev/devicelab/bin/tasks/animated_image_gc_perf.dart b/dev/devicelab/bin/tasks/animated_image_gc_perf.dart
index 23f68d3097..7371f6905f 100644
--- a/dev/devicelab/bin/tasks/animated_image_gc_perf.dart
+++ b/dev/devicelab/bin/tasks/animated_image_gc_perf.dart
@@ -9,11 +9,8 @@ import 'package:flutter_devicelab/tasks/perf_tests.dart';
 
 Future<void> main() async {
   deviceOperatingSystem = DeviceOperatingSystem.android;
-  await task(PerfTest(
+  await task(DevToolsMemoryTest(
     '${flutterDirectory.path}/dev/benchmarks/macrobenchmarks',
     'test_driver/animated_image.dart',
-    'animated_image',
-    measureCpuGpu: true,
-    measureMemory: true,
   ).run);
 }
diff --git a/dev/devicelab/lib/tasks/perf_tests.dart b/dev/devicelab/lib/tasks/perf_tests.dart
index b33d6f9613..1ff6822715 100644
--- a/dev/devicelab/lib/tasks/perf_tests.dart
+++ b/dev/devicelab/lib/tasks/perf_tests.dart
@@ -777,8 +777,6 @@ const List<String> _kCommonScoreKeys = <String>[
   'worst_frame_rasterizer_time_millis',
   '90th_percentile_frame_rasterizer_time_millis',
   '99th_percentile_frame_rasterizer_time_millis',
-  'new_gen_gc_count',
-  'old_gen_gc_count',
 ];
 
 class PerfTestWithSkSL extends PerfTest {