From 27e13dd53e1d69f9edd64513070f2db4dfa9b5dc Mon Sep 17 00:00:00 2001
From: Jonah Williams <jonahwilliams@google.com>
Date: Tue, 28 Jul 2020 11:32:34 -0700
Subject: [PATCH] Revert "Add Crane test to the new Gallery app (#62162)"
 (#62430)

This reverts commit 1ffdfa81d6ba4258ed586a1b0905de74e3961645.
---
 .../bin/tasks/new_gallery__crane_perf.dart    | 33 -------------------
 dev/devicelab/lib/tasks/new_gallery.dart      | 13 ++------
 dev/devicelab/lib/tasks/perf_tests.dart       |  6 ----
 dev/devicelab/manifest.yaml                   |  6 ----
 4 files changed, 2 insertions(+), 56 deletions(-)
 delete mode 100644 dev/devicelab/bin/tasks/new_gallery__crane_perf.dart

diff --git a/dev/devicelab/bin/tasks/new_gallery__crane_perf.dart b/dev/devicelab/bin/tasks/new_gallery__crane_perf.dart
deleted file mode 100644
index a3e24be220..0000000000
--- a/dev/devicelab/bin/tasks/new_gallery__crane_perf.dart
+++ /dev/null
@@ -1,33 +0,0 @@
-// Copyright 2014 The Flutter Authors. All rights reserved.
-// Use of this source code is governed by a BSD-style license that can be
-// found in the LICENSE file.
-
-import 'dart:async';
-import 'dart:io';
-
-import 'package:flutter_devicelab/framework/utils.dart';
-import 'package:flutter_devicelab/tasks/new_gallery.dart';
-import 'package:flutter_devicelab/framework/adb.dart';
-import 'package:flutter_devicelab/framework/framework.dart';
-import 'package:path/path.dart' as path;
-
-Future<void> main() async {
-  deviceOperatingSystem = DeviceOperatingSystem.android;
-
-  final Directory galleryParentDir =
-      Directory.systemTemp.createTempSync('new_gallery_test');
-  final Directory galleryDir =
-      Directory(path.join(galleryParentDir.path, 'gallery'));
-
-  try {
-    await task(
-      NewGalleryPerfTest(
-        galleryDir,
-        timelineFileName: 'transitions-crane',
-        dartDefine: 'onlyCrane=true',
-      ).run,
-    );
-  } finally {
-    rmTree(galleryParentDir);
-  }
-}
diff --git a/dev/devicelab/lib/tasks/new_gallery.dart b/dev/devicelab/lib/tasks/new_gallery.dart
index ef0822b475..b222b76243 100644
--- a/dev/devicelab/lib/tasks/new_gallery.dart
+++ b/dev/devicelab/lib/tasks/new_gallery.dart
@@ -12,23 +12,14 @@ import '../framework/framework.dart';
 import '../framework/utils.dart';
 
 class NewGalleryPerfTest extends PerfTest {
-  NewGalleryPerfTest(
-    this.galleryDir, {
-    String timelineFileName = 'transitions',
-    String dartDefine = '',
-  }) : super(
-    galleryDir.path,
-    'test_driver/transitions_perf.dart',
-    timelineFileName,
-    dartDefine: dartDefine,
-  );
+  NewGalleryPerfTest(this.galleryDir) : super(galleryDir.path, 'test_driver/transitions_perf.dart', 'transitions');
 
   @override
   Future<TaskResult> run() async {
     // Manually roll the new gallery version for now. If the new gallery repo
     // turns out to be updated frequently in the future, we can set up an auto
     // roller to update this version.
-    await getNewGallery('e6357bccc49ec542ca127ca4b26b2b87216d07d5', galleryDir);
+    await getNewGallery('d00362e6bdd0f9b30bba337c358b9e4a6e4ca950', galleryDir);
     return await super.run();
   }
 
diff --git a/dev/devicelab/lib/tasks/perf_tests.dart b/dev/devicelab/lib/tasks/perf_tests.dart
index 06b245aec9..feccd5e78a 100644
--- a/dev/devicelab/lib/tasks/perf_tests.dart
+++ b/dev/devicelab/lib/tasks/perf_tests.dart
@@ -357,7 +357,6 @@ class PerfTest {
     this.testDriver,
     this.needsFullTimeline = true,
     this.benchmarkScoreKeys,
-    this.dartDefine = '',
   });
 
   /// The directory where the app under test is defined.
@@ -396,9 +395,6 @@ class PerfTest {
   /// ```
   final List<String> benchmarkScoreKeys;
 
-  /// Additional flags for `--dart-define` to control the test
-  final String dartDefine;
-
   Future<TaskResult> run() {
     return internalRun();
   }
@@ -431,8 +427,6 @@ class PerfTest {
         if (writeSkslFileName != null)
           ...<String>['--write-sksl-on-exit', writeSkslFileName],
         if (cacheSkSL) '--cache-sksl',
-        if (dartDefine.isNotEmpty)
-          ...<String>['--dart-define', dartDefine],
         '-d',
         deviceId,
       ]);
diff --git a/dev/devicelab/manifest.yaml b/dev/devicelab/manifest.yaml
index 472dbcd8d9..ec549b30ce 100644
--- a/dev/devicelab/manifest.yaml
+++ b/dev/devicelab/manifest.yaml
@@ -820,12 +820,6 @@ tasks:
     stage: devicelab
     required_agent_capabilities: ["mac/ios"]
 
-  new_gallery__crane_perf:
-    description: >
-      Measures the performance of the Crane page in the new Flutter Gallery on Android.
-    stage: devicelab
-    required_agent_capabilities: ["linux/android"]
-
   fast_scroll_large_images__memory:
     description: >
       Measures memory usage for scrolling through a list of large images.