From eec1ac25062e01b1e2f852d4ad876532fd2838a7 Mon Sep 17 00:00:00 2001
From: Kenzie Davisson <kenzieschmoll@google.com>
Date: Thu, 12 Sep 2024 13:59:31 -0700
Subject: [PATCH 01/21] Refactor the test benchmark app to make the example
 easier to follow

---
 packages/web_benchmarks/CHANGELOG.md          |   4 +
 packages/web_benchmarks/README.md             |   4 +-
 packages/web_benchmarks/lib/server.dart       |   9 +-
 packages/web_benchmarks/lib/src/runner.dart   |   9 +-
 packages/web_benchmarks/pubspec.yaml          |   2 +-
 .../testing/test_app/.gitignore               |   9 +-
 .../web_benchmarks/testing/test_app/.metadata |  24 ++-
 .../benchmark/test_infra/automator.dart       | 146 ++++++++++++++++++
 .../test_infra/client/app_client.dart         |  21 +++
 .../client/simple_compilation_client.dart     |  18 +++
 .../test_app/benchmark/test_infra/common.dart |  10 ++
 .../benchmark/test_infra/recorder.dart        |  38 +++++
 .../benchmark}/web_benchmarks_test.dart       |  51 +++---
 .../testing/test_app/lib/about_page.dart      |   6 +-
 .../test_app/lib/benchmarks/runner.dart       | 101 ------------
 .../lib/benchmarks/runner_simple.dart         |  28 ----
 .../testing/test_app/lib/home_page.dart       |   5 +-
 .../testing/test_app/lib/icon_page.dart       |  45 ------
 .../testing/test_app/lib/main.dart            |  28 +++-
 .../testing/test_app/pubspec.yaml             |   8 +
 .../test_app/web/icons/Icon-maskable-192.png  | Bin 0 -> 5594 bytes
 .../test_app/web/icons/Icon-maskable-512.png  | Bin 0 -> 20998 bytes
 .../testing/test_app/web/index.html           |  22 ++-
 .../testing/test_app/web/manifest.json        |  12 ++
 24 files changed, 369 insertions(+), 231 deletions(-)
 create mode 100644 packages/web_benchmarks/testing/test_app/benchmark/test_infra/automator.dart
 create mode 100644 packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/app_client.dart
 create mode 100644 packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/simple_compilation_client.dart
 create mode 100644 packages/web_benchmarks/testing/test_app/benchmark/test_infra/common.dart
 create mode 100644 packages/web_benchmarks/testing/test_app/benchmark/test_infra/recorder.dart
 rename packages/web_benchmarks/testing/{ => test_app/benchmark}/web_benchmarks_test.dart (67%)
 delete mode 100644 packages/web_benchmarks/testing/test_app/lib/benchmarks/runner.dart
 delete mode 100644 packages/web_benchmarks/testing/test_app/lib/benchmarks/runner_simple.dart
 delete mode 100644 packages/web_benchmarks/testing/test_app/lib/icon_page.dart
 create mode 100644 packages/web_benchmarks/testing/test_app/web/icons/Icon-maskable-192.png
 create mode 100644 packages/web_benchmarks/testing/test_app/web/icons/Icon-maskable-512.png

diff --git a/packages/web_benchmarks/CHANGELOG.md b/packages/web_benchmarks/CHANGELOG.md
index 434f9bee76d..a8b4eb16091 100644
--- a/packages/web_benchmarks/CHANGELOG.md
+++ b/packages/web_benchmarks/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 3.0.0-wip
+
+* Restructure the `testing/test_app` to make the example benchmarks easier to follow.
+
 ## 2.0.2
 
 * Updates minimum supported SDK version to Flutter 3.19/Dart 3.3.
diff --git a/packages/web_benchmarks/README.md b/packages/web_benchmarks/README.md
index ce98a22b194..9b63bf815d4 100644
--- a/packages/web_benchmarks/README.md
+++ b/packages/web_benchmarks/README.md
@@ -5,14 +5,14 @@ benchmarks in Chrome.
 
 # Writing a benchmark
 
-An example benchmark can be found in [testing/web_benchmark_test.dart][1].
+An example benchmark can be found in [testing/test_app/benchmark/web_benchmark_test.dart][1].
 
 A web benchmark is made of two parts: a client and a server. The client is code
 that runs in the browser together with the benchmark code. The server serves the
 app's code and assets. Additionally, the server communicates with the browser to
 extract the performance traces.
 
-[1]: https://github.com/flutter/packages/blob/master/packages/web_benchmarks/testing/web_benchmarks_test.dart
+[1]: https://github.com/flutter/packages/blob/master/packages/web_benchmarks/testing/test_app/benchmark/web_benchmarks_test.dart
 
 # Analyzing benchmark results
 
diff --git a/packages/web_benchmarks/lib/server.dart b/packages/web_benchmarks/lib/server.dart
index 514b111d95f..80e5f7a4f50 100644
--- a/packages/web_benchmarks/lib/server.dart
+++ b/packages/web_benchmarks/lib/server.dart
@@ -32,8 +32,6 @@ const int defaultChromeDebugPort = 10000;
 /// can be different (and typically is) from the production entry point of the
 /// app.
 ///
-/// If [useCanvasKit] is true, builds the app in CanvasKit mode.
-///
 /// [benchmarkServerPort] is the port this benchmark server serves the app on.
 /// By default uses [defaultBenchmarkServerPort].
 ///
@@ -42,6 +40,13 @@ const int defaultChromeDebugPort = 10000;
 ///
 /// If [headless] is true, runs Chrome without UI. In particular, this is
 /// useful in environments (e.g. CI) that doesn't have a display.
+///
+/// If [treeShakeIcons] is false, '--no-tree-shake-icons' will be passed as a
+/// build argument when building the benchmark app.
+///
+/// [compilationOptions] specify the compiler and renderer to use for the
+/// benchmark app. This can either use dart2wasm & skwasm or
+/// dart2js & canvaskit.
 Future<BenchmarkResults> serveWebBenchmark({
   required io.Directory benchmarkAppDirectory,
   required String entryPoint,
diff --git a/packages/web_benchmarks/lib/src/runner.dart b/packages/web_benchmarks/lib/src/runner.dart
index 3ad6f86c96e..0c929104622 100644
--- a/packages/web_benchmarks/lib/src/runner.dart
+++ b/packages/web_benchmarks/lib/src/runner.dart
@@ -39,8 +39,6 @@ class BenchmarkServer {
   /// can be different (and typically is) from the production entry point of the
   /// app.
   ///
-  /// If [useCanvasKit] is true, builds the app in CanvasKit mode.
-  ///
   /// [benchmarkServerPort] is the port this benchmark server serves the app on.
   ///
   /// [chromeDebugPort] is the port Chrome uses for DevTool Protocol used to
@@ -48,6 +46,13 @@ class BenchmarkServer {
   ///
   /// If [headless] is true, runs Chrome without UI. In particular, this is
   /// useful in environments (e.g. CI) that doesn't have a display.
+  ///
+  /// If [treeShakeIcons] is false, '--no-tree-shake-icons' will be passed as a
+  /// build argument when building the benchmark app.
+  ///
+  /// [compilationOptions] specify the compiler and renderer to use for the
+  /// benchmark app. This can either use dart2wasm & skwasm or
+  /// dart2js & canvaskit.
   BenchmarkServer({
     required this.benchmarkAppDirectory,
     required this.entryPoint,
diff --git a/packages/web_benchmarks/pubspec.yaml b/packages/web_benchmarks/pubspec.yaml
index 6386767133d..0bc109d17d3 100644
--- a/packages/web_benchmarks/pubspec.yaml
+++ b/packages/web_benchmarks/pubspec.yaml
@@ -2,7 +2,7 @@ name: web_benchmarks
 description: A benchmark harness for performance-testing Flutter apps in Chrome.
 repository: https://github.com/flutter/packages/tree/main/packages/web_benchmarks
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+web_benchmarks%22
-version: 2.0.2
+version: 3.0.0-wip
 
 environment:
   sdk: ^3.3.0
diff --git a/packages/web_benchmarks/testing/test_app/.gitignore b/packages/web_benchmarks/testing/test_app/.gitignore
index 9f6b8e534c2..79c113f9b50 100644
--- a/packages/web_benchmarks/testing/test_app/.gitignore
+++ b/packages/web_benchmarks/testing/test_app/.gitignore
@@ -5,9 +5,12 @@
 *.swp
 .DS_Store
 .atom/
+.build/
 .buildlog/
 .history
 .svn/
+.swiftpm/
+migrate_working_dir/
 
 # IntelliJ related
 *.iml
@@ -26,7 +29,6 @@
 .dart_tool/
 .flutter-plugins
 .flutter-plugins-dependencies
-.packages
 .pub-cache/
 .pub/
 /build/
@@ -36,3 +38,8 @@ app.*.symbols
 
 # Obfuscation related
 app.*.map.json
+
+# Android Studio will place build artifacts here
+/android/app/debug
+/android/app/profile
+/android/app/release
diff --git a/packages/web_benchmarks/testing/test_app/.metadata b/packages/web_benchmarks/testing/test_app/.metadata
index 5e875f26787..7dd91c1357b 100644
--- a/packages/web_benchmarks/testing/test_app/.metadata
+++ b/packages/web_benchmarks/testing/test_app/.metadata
@@ -4,7 +4,27 @@
 # This file should be version controlled and should not be manually edited.
 
 version:
-  revision: d26268bb9e6d713a73d6148da7fa75936d442741
-  channel: master
+  revision: "0cd170798c6462aec738d4c749ce3a5fff1c80cf"
+  channel: "master"
 
 project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: 0cd170798c6462aec738d4c749ce3a5fff1c80cf
+      base_revision: 0cd170798c6462aec738d4c749ce3a5fff1c80cf
+    - platform: web
+      create_revision: 0cd170798c6462aec738d4c749ce3a5fff1c80cf
+      base_revision: 0cd170798c6462aec738d4c749ce3a5fff1c80cf
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'
diff --git a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/automator.dart b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/automator.dart
new file mode 100644
index 00000000000..1e5592424bf
--- /dev/null
+++ b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/automator.dart
@@ -0,0 +1,146 @@
+// Copyright 2013 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.
+
+// ignore_for_file: avoid_print
+
+import 'dart:async';
+
+import 'package:flutter/foundation.dart';
+import 'package:flutter/material.dart';
+import 'package:flutter_test/flutter_test.dart';
+import 'package:test_app/home_page.dart' show aboutPageKey, textKey;
+import 'package:test_app/main.dart';
+import 'package:web/web.dart';
+import 'package:web_benchmarks/client.dart';
+
+import 'common.dart';
+
+/// A class that automates the test web app.
+class Automater {
+  Automater({
+    required this.benchmark,
+    required this.stopWarmingUpCallback,
+    required this.profile,
+  });
+
+  /// The current benchmark.
+  final BenchmarkName benchmark;
+
+  /// A function to call when warm-up is finished.
+  ///
+  /// This function is intended to ask `Recorder` to mark the warm-up phase
+  /// as over.
+  final void Function() stopWarmingUpCallback;
+
+  /// The profile collected for the running benchmark
+  final Profile profile;
+
+  /// Whether the automation has ended.
+  bool finished = false;
+
+  /// A widget controller for automation.
+  late LiveWidgetController controller;
+
+  Widget createWidget() {
+    Future<void>.delayed(const Duration(milliseconds: 400), automate);
+    return const MyApp();
+  }
+
+  Future<void> automate() async {
+    await warmUp();
+
+    switch (benchmark) {
+      case BenchmarkName.appNavigate:
+        await _handleAppNavigate();
+      case BenchmarkName.appScroll:
+        await _handleAppScroll();
+      case BenchmarkName.appTap:
+        await _handleAppTap();
+      case BenchmarkName.simpleCompilationCheck:
+        _handleSimpleCompilationCheck();
+      case BenchmarkName.simpleBenchmarkPathCheck:
+        _handleSimpleBenchmarkPathCheck();
+    }
+
+    // At the end of the test, mark as finished.
+    finished = true;
+  }
+
+  /// Warm up the animation.
+  Future<void> warmUp() async {
+    // Let animation stop.
+    await animationStops();
+
+    // Set controller.
+    controller = LiveWidgetController(WidgetsBinding.instance);
+
+    await controller.pumpAndSettle();
+
+    // When warm-up finishes, inform the recorder.
+    stopWarmingUpCallback();
+  }
+
+  Future<void> _handleAppNavigate() async {
+    for (int i = 0; i < 10; ++i) {
+      print('Testing round $i...');
+      await controller.tap(find.byKey(aboutPageKey));
+      await animationStops();
+      await controller.tap(find.byType(BackButton));
+      await animationStops();
+    }
+  }
+
+  Future<void> _handleAppScroll() async {
+    final ScrollableState scrollable =
+        Scrollable.of(find.byKey(textKey).evaluate().single);
+    await scrollable.position.animateTo(
+      30000,
+      curve: Curves.linear,
+      duration: const Duration(seconds: 20),
+    );
+  }
+
+  Future<void> _handleAppTap() async {
+    for (int i = 0; i < 10; ++i) {
+      print('Testing round $i...');
+      await controller.tap(find.byIcon(Icons.add));
+      await animationStops();
+    }
+  }
+
+  void _handleSimpleCompilationCheck() {
+    // Record whether we are in wasm mode or not. Ideally, we'd have a more
+    // first-class way to add metadata like this, but this will work for us to
+    // pass information about the environment back to the server for the
+    // purposes of our own tests.
+    profile.extraData['isWasm'] = kIsWasm ? 1 : 0;
+  }
+
+  void _handleSimpleBenchmarkPathCheck() {
+    // Record whether the URL contains the expected path so we can verify the
+    // behavior of setting the `benchmarkPath` on the benchmark server.
+    final bool containsExpectedPath =
+        window.location.toString().contains(testBenchmarkPath);
+    profile.extraData['expectedUrl'] = containsExpectedPath ? 1 : 0;
+  }
+}
+
+const Duration _animationCheckingInterval = Duration(milliseconds: 50);
+
+Future<void> animationStops() async {
+  if (!WidgetsBinding.instance.hasScheduledFrame) {
+    return;
+  }
+
+  final Completer<void> stopped = Completer<void>();
+
+  Timer.periodic(_animationCheckingInterval, (Timer timer) {
+    if (!WidgetsBinding.instance.hasScheduledFrame) {
+      stopped.complete();
+      timer.cancel();
+    }
+  });
+
+  await stopped.future;
+}
diff --git a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/app_client.dart b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/app_client.dart
new file mode 100644
index 00000000000..2887ba9b7c2
--- /dev/null
+++ b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/app_client.dart
@@ -0,0 +1,21 @@
+// Copyright 2013 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 'package:web_benchmarks/client.dart';
+
+import '../common.dart';
+import '../recorder.dart';
+
+Future<void> main() async {
+  await runBenchmarks(
+    <String, RecorderFactory>{
+      BenchmarkName.appNavigate.name: () =>
+          TestAppRecorder(benchmark: BenchmarkName.appNavigate),
+      BenchmarkName.appScroll.name: () =>
+          TestAppRecorder(benchmark: BenchmarkName.appScroll),
+      BenchmarkName.appTap.name: () =>
+          TestAppRecorder(benchmark: BenchmarkName.appTap),
+    },
+  );
+}
diff --git a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/simple_compilation_client.dart b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/simple_compilation_client.dart
new file mode 100644
index 00000000000..301ca2111e7
--- /dev/null
+++ b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/simple_compilation_client.dart
@@ -0,0 +1,18 @@
+// Copyright 2013 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 'package:web_benchmarks/client.dart';
+
+import '../common.dart';
+import '../recorder.dart';
+
+Future<void> main() async {
+  await runBenchmarks(
+    <String, RecorderFactory>{
+      BenchmarkName.simpleCompilationCheck.name: () => TestAppRecorder(
+            benchmark: BenchmarkName.simpleCompilationCheck,
+          ),
+    },
+  );
+}
diff --git a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/common.dart b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/common.dart
new file mode 100644
index 00000000000..06667d8738d
--- /dev/null
+++ b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/common.dart
@@ -0,0 +1,10 @@
+// Copyright 2013 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.
+
+enum BenchmarkName {
+  appNavigate,
+  appScroll,
+  appTap,
+  simpleCompilationCheck;
+}
diff --git a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/recorder.dart b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/recorder.dart
new file mode 100644
index 00000000000..ba0dc55ba30
--- /dev/null
+++ b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/recorder.dart
@@ -0,0 +1,38 @@
+// Copyright 2013 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 'package:flutter/material.dart';
+import 'package:web_benchmarks/client.dart';
+
+import 'automator.dart';
+import 'common.dart';
+
+/// A recorder that measures frame building durations for the test app.
+class TestAppRecorder extends WidgetRecorder {
+  TestAppRecorder({required this.benchmark})
+      : super(name: benchmark.name, useCustomWarmUp: true);
+
+  /// The name of the benchmark to be run.
+  ///
+  /// See `common.dart` for the list of the names of all benchmarks.
+  final BenchmarkName benchmark;
+
+  Automater? _automator;
+  bool get _finished => _automator?.finished ?? false;
+
+  /// Whether we should continue recording.
+  @override
+  bool shouldContinue() => !_finished || profile.shouldContinue();
+
+  /// Creates the [Automater] widget.
+  @override
+  Widget createWidget() {
+    _automator = Automater(
+      benchmark: benchmark,
+      stopWarmingUpCallback: profile.stopWarmingUp,
+      profile: profile,
+    );
+    return _automator!.createWidget();
+  }
+}
diff --git a/packages/web_benchmarks/testing/web_benchmarks_test.dart b/packages/web_benchmarks/testing/test_app/benchmark/web_benchmarks_test.dart
similarity index 67%
rename from packages/web_benchmarks/testing/web_benchmarks_test.dart
rename to packages/web_benchmarks/testing/test_app/benchmark/web_benchmarks_test.dart
index 3cdefc671d7..7a83c5ddbe5 100644
--- a/packages/web_benchmarks/testing/web_benchmarks_test.dart
+++ b/packages/web_benchmarks/testing/test_app/benchmark/web_benchmarks_test.dart
@@ -10,43 +10,38 @@ import 'package:test/test.dart';
 import 'package:web_benchmarks/server.dart';
 import 'package:web_benchmarks/src/common.dart';
 
-Future<void> main() async {
-  test('Can run a web benchmark', () async {
-    await _runBenchmarks(
-      benchmarkNames: <String>['scroll', 'page', 'tap'],
-      entryPoint: 'lib/benchmarks/runner.dart',
-    );
-  }, timeout: Timeout.none);
-
-  test('Can run a web benchmark with an alternate initial page', () async {
-    final BenchmarkResults results = await _runBenchmarks(
-      benchmarkNames: <String>['simple'],
-      entryPoint: 'lib/benchmarks/runner_simple.dart',
-      initialPage: 'index.html#about',
-    );
-
-    // The simple runner just puts an `isWasm` metric in there so we can make
-    // sure that we're running in the right environment.
-    final List<BenchmarkScore>? scores = results.scores['simple'];
-    expect(scores, isNotNull);
+import 'test_infra/common.dart';
 
-    final BenchmarkScore isWasmScore =
-        scores!.firstWhere((BenchmarkScore score) => score.metric == 'isWasm');
-    expect(isWasmScore.value, 0);
-  }, timeout: Timeout.none);
+Future<void> main() async {
+  test(
+    'Can run a web benchmark',
+    () async {
+      await _runBenchmarks(
+        benchmarkNames: <String>[
+          BenchmarkName.appNavigate.name,
+          BenchmarkName.appScroll.name,
+          BenchmarkName.appTap.name,
+        ],
+        entryPoint: 'benchmark/test_infra/client/app_client.dart',
+      );
+    },
+    timeout: Timeout.none,
+  );
 
   test(
     'Can run a web benchmark with wasm',
     () async {
       final BenchmarkResults results = await _runBenchmarks(
-        benchmarkNames: <String>['simple'],
-        entryPoint: 'lib/benchmarks/runner_simple.dart',
+        benchmarkNames: <String>[BenchmarkName.simpleCompilationCheck.name],
+        entryPoint:
+            'benchmark/test_infra/client/simple_compilation_client.dart',
         compilationOptions: const CompilationOptions.wasm(),
       );
 
       // The simple runner just puts an `isWasm` metric in there so we can make
       // sure that we're running in the right environment.
-      final List<BenchmarkScore>? scores = results.scores['simple'];
+      final List<BenchmarkScore>? scores =
+          results.scores[BenchmarkName.simpleCompilationCheck.name];
       expect(scores, isNotNull);
 
       final BenchmarkScore isWasmScore = scores!
@@ -60,14 +55,14 @@ Future<void> main() async {
 Future<BenchmarkResults> _runBenchmarks({
   required List<String> benchmarkNames,
   required String entryPoint,
-  String initialPage = defaultInitialPage,
+  String benchmarkPath = defaultInitialPath,
   CompilationOptions compilationOptions = const CompilationOptions.js(),
 }) async {
   final BenchmarkResults taskResult = await serveWebBenchmark(
     benchmarkAppDirectory: Directory('testing/test_app'),
     entryPoint: entryPoint,
     treeShakeIcons: false,
-    initialPage: initialPage,
+    benchmarkPath: benchmarkPath,
     compilationOptions: compilationOptions,
   );
 
diff --git a/packages/web_benchmarks/testing/test_app/lib/about_page.dart b/packages/web_benchmarks/testing/test_app/lib/about_page.dart
index 4147c33f8f1..23f85320eaf 100644
--- a/packages/web_benchmarks/testing/test_app/lib/about_page.dart
+++ b/packages/web_benchmarks/testing/test_app/lib/about_page.dart
@@ -3,8 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-
-const ValueKey<String> backKey = ValueKey<String>('backKey');
+import 'package:go_router/go_router.dart';
 
 class AboutPage extends StatelessWidget {
   const AboutPage({super.key});
@@ -14,8 +13,7 @@ class AboutPage extends StatelessWidget {
     return Scaffold(
       appBar: AppBar(
         leading: BackButton(
-          key: backKey,
-          onPressed: () => Navigator.of(context).pop(),
+          onPressed: () => context.canPop() ? context.pop() : context.go('/'),
         ),
       ),
       body: Center(
diff --git a/packages/web_benchmarks/testing/test_app/lib/benchmarks/runner.dart b/packages/web_benchmarks/testing/test_app/lib/benchmarks/runner.dart
deleted file mode 100644
index 9a870dfca2e..00000000000
--- a/packages/web_benchmarks/testing/test_app/lib/benchmarks/runner.dart
+++ /dev/null
@@ -1,101 +0,0 @@
-// Copyright 2013 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.
-
-// ignore_for_file: avoid_print
-
-import 'package:flutter/material.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:web_benchmarks/client.dart';
-
-import '../about_page.dart' show backKey;
-import '../home_page.dart' show aboutPageKey, textKey;
-import '../main.dart';
-
-/// A recorder that measures frame building durations.
-abstract class AppRecorder extends WidgetRecorder {
-  AppRecorder({required this.benchmarkName}) : super(name: benchmarkName);
-
-  final String benchmarkName; // ignore: unreachable_from_main
-
-  Future<void> automate();
-
-  @override
-  Widget createWidget() {
-    Future<void>.delayed(const Duration(milliseconds: 400), automate);
-    return const MyApp();
-  }
-
-  Future<void> animationStops() async {
-    while (WidgetsBinding.instance.hasScheduledFrame) {
-      await Future<void>.delayed(const Duration(milliseconds: 200));
-    }
-  }
-}
-
-class ScrollRecorder extends AppRecorder {
-  ScrollRecorder() : super(benchmarkName: 'scroll');
-
-  @override
-  Future<void> automate() async {
-    final ScrollableState scrollable =
-        Scrollable.of(find.byKey(textKey).evaluate().single);
-    await scrollable.position.animateTo(
-      30000,
-      curve: Curves.linear,
-      duration: const Duration(seconds: 20),
-    );
-  }
-}
-
-class PageRecorder extends AppRecorder {
-  PageRecorder() : super(benchmarkName: 'page');
-
-  bool _completed = false;
-
-  @override
-  bool shouldContinue() => profile.shouldContinue() || !_completed;
-
-  @override
-  Future<void> automate() async {
-    final LiveWidgetController controller =
-        LiveWidgetController(WidgetsBinding.instance);
-    for (int i = 0; i < 10; ++i) {
-      print('Testing round $i...');
-      await controller.tap(find.byKey(aboutPageKey));
-      await animationStops();
-      await controller.tap(find.byKey(backKey));
-      await animationStops();
-    }
-    _completed = true;
-  }
-}
-
-class TapRecorder extends AppRecorder {
-  TapRecorder() : super(benchmarkName: 'tap');
-
-  bool _completed = false;
-
-  @override
-  bool shouldContinue() => profile.shouldContinue() || !_completed;
-
-  @override
-  Future<void> automate() async {
-    final LiveWidgetController controller =
-        LiveWidgetController(WidgetsBinding.instance);
-    for (int i = 0; i < 10; ++i) {
-      print('Testing round $i...');
-      await controller.tap(find.byIcon(Icons.add));
-      await animationStops();
-    }
-    _completed = true;
-  }
-}
-
-Future<void> main() async {
-  await runBenchmarks(<String, RecorderFactory>{
-    'scroll': () => ScrollRecorder(),
-    'page': () => PageRecorder(),
-    'tap': () => TapRecorder(),
-  });
-}
diff --git a/packages/web_benchmarks/testing/test_app/lib/benchmarks/runner_simple.dart b/packages/web_benchmarks/testing/test_app/lib/benchmarks/runner_simple.dart
deleted file mode 100644
index c233ebe6187..00000000000
--- a/packages/web_benchmarks/testing/test_app/lib/benchmarks/runner_simple.dart
+++ /dev/null
@@ -1,28 +0,0 @@
-// Copyright 2013 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 'package:flutter/foundation.dart';
-import 'package:flutter_test/flutter_test.dart';
-import 'package:web_benchmarks/client.dart';
-
-import 'runner.dart';
-
-class SimpleRecorder extends AppRecorder {
-  SimpleRecorder() : super(benchmarkName: 'simple');
-
-  @override
-  Future<void> automate() async {
-    // Record whether we are in wasm mode or not. Ideally, we'd have a more
-    // first-class way to add metadata like this, but this will work for us to
-    // pass information about the environment back to the server for the
-    // purposes of our own tests.
-    profile.extraData['isWasm'] = kIsWasm ? 1 : 0;
-  }
-}
-
-Future<void> main() async {
-  await runBenchmarks(<String, RecorderFactory>{
-    'simple': () => SimpleRecorder(),
-  });
-}
diff --git a/packages/web_benchmarks/testing/test_app/lib/home_page.dart b/packages/web_benchmarks/testing/test_app/lib/home_page.dart
index dee8c9d0eeb..c0f7a131aec 100644
--- a/packages/web_benchmarks/testing/test_app/lib/home_page.dart
+++ b/packages/web_benchmarks/testing/test_app/lib/home_page.dart
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 
 const ValueKey<String> textKey = ValueKey<String>('textKey');
 const ValueKey<String> aboutPageKey = ValueKey<String>('aboutPageKey');
@@ -33,8 +34,8 @@ class _HomePageState extends State<HomePage> {
         actions: <Widget>[
           IconButton(
             key: aboutPageKey,
-            icon: const Icon(Icons.alternate_email),
-            onPressed: () => Navigator.of(context).pushNamed('about'),
+            icon: const Icon(Icons.help_outline),
+            onPressed: () => context.go('/about'),
           ),
         ],
       ),
diff --git a/packages/web_benchmarks/testing/test_app/lib/icon_page.dart b/packages/web_benchmarks/testing/test_app/lib/icon_page.dart
deleted file mode 100644
index fd0da430ee0..00000000000
--- a/packages/web_benchmarks/testing/test_app/lib/icon_page.dart
+++ /dev/null
@@ -1,45 +0,0 @@
-// Copyright 2013 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 'package:flutter/material.dart';
-
-class IconGeneratorPage extends StatefulWidget {
-  const IconGeneratorPage({super.key});
-
-  static int defaultIconCodePoint = int.parse('0xf03f');
-
-  @override
-  State<IconGeneratorPage> createState() => _IconGeneratorPageState();
-}
-
-class _IconGeneratorPageState extends State<IconGeneratorPage> {
-  int iconCodePoint = IconGeneratorPage.defaultIconCodePoint;
-
-  @override
-  Widget build(BuildContext context) {
-    return Column(
-      children: <Widget>[
-        TextField(
-          onSubmitted: (String value) {
-            final int codePointAsInt =
-                int.tryParse(value) ?? IconGeneratorPage.defaultIconCodePoint;
-            setState(() {
-              iconCodePoint = codePointAsInt;
-            });
-          },
-        ),
-        const SizedBox(height: 24.0),
-        Icon(generateIcon(iconCodePoint)),
-      ],
-    );
-  }
-
-  // Unless '--no-tree-shake-icons' is passed to the flutter build command,
-  // the presence of this method will trigger an exception due to the use of
-  // non-constant invocations of [IconData].
-  IconData generateIcon(int materialIconCodePoint) => IconData(
-        materialIconCodePoint,
-        fontFamily: 'MaterialIcons',
-      );
-}
diff --git a/packages/web_benchmarks/testing/test_app/lib/main.dart b/packages/web_benchmarks/testing/test_app/lib/main.dart
index e07fc56ec2a..172abba3288 100644
--- a/packages/web_benchmarks/testing/test_app/lib/main.dart
+++ b/packages/web_benchmarks/testing/test_app/lib/main.dart
@@ -3,32 +3,44 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
+import 'package:flutter_web_plugins/url_strategy.dart';
+import 'package:go_router/go_router.dart';
 
 import 'about_page.dart';
 import 'home_page.dart';
-import 'icon_page.dart';
 
 void main() {
+  usePathUrlStrategy();
   runApp(const MyApp());
 }
 
+final GoRouter _router = GoRouter(
+  routes: <GoRoute>[
+    GoRoute(
+      path: '/',
+      builder: (_, __) => const HomePage(title: 'Flutter Demo Home Page'),
+    ),
+    GoRoute(
+      path: '/about',
+      builder: (_, __) => const AboutPage(),
+    ),
+  ],
+);
+
 class MyApp extends StatelessWidget {
   const MyApp({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return MaterialApp(
+    return MaterialApp.router(
       title: 'Flutter Demo',
       theme: ThemeData(
         primarySwatch: Colors.blue,
         visualDensity: VisualDensity.adaptivePlatformDensity,
       ),
-      initialRoute: 'home',
-      routes: <String, WidgetBuilder>{
-        'home': (_) => const HomePage(title: 'Flutter Demo Home Page'),
-        'about': (_) => const AboutPage(),
-        'icon_generator': (_) => const IconGeneratorPage(),
-      },
+      routerConfig: _router,
+      // This blocks the About page button.
+      debugShowCheckedModeBanner: false,
     );
   }
 }
diff --git a/packages/web_benchmarks/testing/test_app/pubspec.yaml b/packages/web_benchmarks/testing/test_app/pubspec.yaml
index e298d6defa4..58dffcd083e 100644
--- a/packages/web_benchmarks/testing/test_app/pubspec.yaml
+++ b/packages/web_benchmarks/testing/test_app/pubspec.yaml
@@ -11,8 +11,16 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
+  flutter_web_plugins:
+    sdk: flutter
+  go_router: ^14.2.7
+
+dev_dependencies:
+  flutter_lints: ^4.0.0
   flutter_test:
     sdk: flutter
+  test: ^1.25.8
+  web: ">=0.5.1 <2.0.0"
   web_benchmarks:
     path: ../../
 
diff --git a/packages/web_benchmarks/testing/test_app/web/icons/Icon-maskable-192.png b/packages/web_benchmarks/testing/test_app/web/icons/Icon-maskable-192.png
new file mode 100644
index 0000000000000000000000000000000000000000..eb9b4d76e525556d5d89141648c724331630325d
GIT binary patch
literal 5594
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
X>c!)3PgKfL&lX^$Z>Cpu&6)6jvi^Z!

literal 0
HcmV?d00001

diff --git a/packages/web_benchmarks/testing/test_app/web/icons/Icon-maskable-512.png b/packages/web_benchmarks/testing/test_app/web/icons/Icon-maskable-512.png
new file mode 100644
index 0000000000000000000000000000000000000000..d69c56691fbdb0b7efa65097c7cc1edac12a6d3e
GIT binary patch
literal 20998
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
MPgg&ebxsLQ025IeI{*Lx

literal 0
HcmV?d00001

diff --git a/packages/web_benchmarks/testing/test_app/web/index.html b/packages/web_benchmarks/testing/test_app/web/index.html
index 5b2c184c9a8..98fc61ffe20 100644
--- a/packages/web_benchmarks/testing/test_app/web/index.html
+++ b/packages/web_benchmarks/testing/test_app/web/index.html
@@ -1,15 +1,27 @@
 <!DOCTYPE html>
-<!-- Copyright 2013 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. -->
 <html>
 <head>
+  <!--
+    If you are serving your web app in a path other than the root, change the
+    href value below to reflect the base path you are serving from.
+
+    The path provided below has to start and end with a slash "/" in order for
+    it to work correctly.
+
+    For more details:
+    * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
+
+    This is a placeholder for base href that will be replaced by the value of
+    the `--base-href` argument provided to `flutter build`.
+  -->
+  <base href="$FLUTTER_BASE_HREF">
+
   <meta charset="UTF-8">
   <meta content="IE=Edge" http-equiv="X-UA-Compatible">
   <meta name="description" content="A new Flutter project.">
 
   <!-- iOS meta tags & icons -->
-  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="mobile-web-app-capable" content="yes">
   <meta name="apple-mobile-web-app-status-bar-style" content="black">
   <meta name="apple-mobile-web-app-title" content="test_app">
   <link rel="apple-touch-icon" href="icons/Icon-192.png">
@@ -21,6 +33,6 @@
   <link rel="manifest" href="manifest.json">
 </head>
 <body>
-  <script src="flutter_bootstrap.js" type="application/javascript" async></script>
+  <script src="flutter_bootstrap.js" async></script>
 </body>
 </html>
diff --git a/packages/web_benchmarks/testing/test_app/web/manifest.json b/packages/web_benchmarks/testing/test_app/web/manifest.json
index 13a23690776..8242090a0aa 100644
--- a/packages/web_benchmarks/testing/test_app/web/manifest.json
+++ b/packages/web_benchmarks/testing/test_app/web/manifest.json
@@ -18,6 +18,18 @@
             "src": "icons/Icon-512.png",
             "sizes": "512x512",
             "type": "image/png"
+        },
+        {
+            "src": "icons/Icon-maskable-192.png",
+            "sizes": "192x192",
+            "type": "image/png",
+            "purpose": "maskable"
+        },
+        {
+            "src": "icons/Icon-maskable-512.png",
+            "sizes": "512x512",
+            "type": "image/png",
+            "purpose": "maskable"
         }
     ]
 }

From 0a155ece870a0b6cd03b52928553644135b4ed98 Mon Sep 17 00:00:00 2001
From: Kenzie Davisson <kenzieschmoll@google.com>
Date: Thu, 12 Sep 2024 14:00:01 -0700
Subject: [PATCH 02/21] remove case

---
 .../test_app/benchmark/test_infra/automator.dart       | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/automator.dart b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/automator.dart
index 1e5592424bf..45f43ae7346 100644
--- a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/automator.dart
+++ b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/automator.dart
@@ -59,8 +59,6 @@ class Automater {
         await _handleAppTap();
       case BenchmarkName.simpleCompilationCheck:
         _handleSimpleCompilationCheck();
-      case BenchmarkName.simpleBenchmarkPathCheck:
-        _handleSimpleBenchmarkPathCheck();
     }
 
     // At the end of the test, mark as finished.
@@ -116,14 +114,6 @@ class Automater {
     // purposes of our own tests.
     profile.extraData['isWasm'] = kIsWasm ? 1 : 0;
   }
-
-  void _handleSimpleBenchmarkPathCheck() {
-    // Record whether the URL contains the expected path so we can verify the
-    // behavior of setting the `benchmarkPath` on the benchmark server.
-    final bool containsExpectedPath =
-        window.location.toString().contains(testBenchmarkPath);
-    profile.extraData['expectedUrl'] = containsExpectedPath ? 1 : 0;
-  }
 }
 
 const Duration _animationCheckingInterval = Duration(milliseconds: 50);

From dfd6d34214b0f1c61139729ea0e71666568b6a39 Mon Sep 17 00:00:00 2001
From: Kenzie Davisson <kenzieschmoll@google.com>
Date: Thu, 12 Sep 2024 14:03:03 -0700
Subject: [PATCH 03/21] fix test

---
 .../benchmark/web_benchmarks_test.dart        | 25 +++++++++++++++++--
 1 file changed, 23 insertions(+), 2 deletions(-)

diff --git a/packages/web_benchmarks/testing/test_app/benchmark/web_benchmarks_test.dart b/packages/web_benchmarks/testing/test_app/benchmark/web_benchmarks_test.dart
index 7a83c5ddbe5..a42557b83a6 100644
--- a/packages/web_benchmarks/testing/test_app/benchmark/web_benchmarks_test.dart
+++ b/packages/web_benchmarks/testing/test_app/benchmark/web_benchmarks_test.dart
@@ -28,6 +28,27 @@ Future<void> main() async {
     timeout: Timeout.none,
   );
 
+  test(
+    'Can run a web benchmark with an alternate initial page',
+    () async {
+      final BenchmarkResults results = await _runBenchmarks(
+        benchmarkNames: <String>['simple'],
+        entryPoint: 'lib/benchmarks/runner_simple.dart',
+        initialPage: 'index.html#about',
+      );
+
+      // The simple runner just puts an `isWasm` metric in there so we can make
+      // sure that we're running in the right environment.
+      final List<BenchmarkScore>? scores = results.scores['simple'];
+      expect(scores, isNotNull);
+
+      final BenchmarkScore isWasmScore = scores!
+          .firstWhere((BenchmarkScore score) => score.metric == 'isWasm');
+      expect(isWasmScore.value, 0);
+    },
+    timeout: Timeout.none,
+  );
+
   test(
     'Can run a web benchmark with wasm',
     () async {
@@ -55,14 +76,14 @@ Future<void> main() async {
 Future<BenchmarkResults> _runBenchmarks({
   required List<String> benchmarkNames,
   required String entryPoint,
-  String benchmarkPath = defaultInitialPath,
+  String initialPage = defaultInitialPage,
   CompilationOptions compilationOptions = const CompilationOptions.js(),
 }) async {
   final BenchmarkResults taskResult = await serveWebBenchmark(
     benchmarkAppDirectory: Directory('testing/test_app'),
     entryPoint: entryPoint,
     treeShakeIcons: false,
-    benchmarkPath: benchmarkPath,
+    initialPage: initialPage,
     compilationOptions: compilationOptions,
   );
 

From 31adbd36b7452847bb821da616db30b06d3ef682 Mon Sep 17 00:00:00 2001
From: Kenzie Davisson <kenzieschmoll@google.com>
Date: Thu, 12 Sep 2024 14:03:18 -0700
Subject: [PATCH 04/21] remove import

---
 .../testing/test_app/benchmark/test_infra/automator.dart         | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/automator.dart b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/automator.dart
index 45f43ae7346..05d953d85a8 100644
--- a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/automator.dart
+++ b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/automator.dart
@@ -11,7 +11,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:test_app/home_page.dart' show aboutPageKey, textKey;
 import 'package:test_app/main.dart';
-import 'package:web/web.dart';
 import 'package:web_benchmarks/client.dart';
 
 import 'common.dart';

From ec8ca103a12e0e89ffe6e29dc0f069b64184801b Mon Sep 17 00:00:00 2001
From: Kenzie Davisson <kenzieschmoll@google.com>
Date: Thu, 12 Sep 2024 14:37:42 -0700
Subject: [PATCH 05/21] clean up

---
 .../benchmark/test_infra/automator.dart       | 11 +++++++++
 .../client/simple_initial_page_client.dart    | 19 +++++++++++++++
 .../test_app/benchmark/test_infra/common.dart |  3 +++
 .../benchmark/web_benchmarks_test.dart        | 23 +++++++++++--------
 4 files changed, 46 insertions(+), 10 deletions(-)
 create mode 100644 packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/simple_initial_page_client.dart

diff --git a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/automator.dart b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/automator.dart
index 05d953d85a8..45cc5082efb 100644
--- a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/automator.dart
+++ b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/automator.dart
@@ -11,6 +11,7 @@ import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 import 'package:test_app/home_page.dart' show aboutPageKey, textKey;
 import 'package:test_app/main.dart';
+import 'package:web/web.dart';
 import 'package:web_benchmarks/client.dart';
 
 import 'common.dart';
@@ -58,6 +59,8 @@ class Automater {
         await _handleAppTap();
       case BenchmarkName.simpleCompilationCheck:
         _handleSimpleCompilationCheck();
+      case BenchmarkName.simpleInitialPageCheck:
+        _handleSimpleInitialPageCheck();
     }
 
     // At the end of the test, mark as finished.
@@ -113,6 +116,14 @@ class Automater {
     // purposes of our own tests.
     profile.extraData['isWasm'] = kIsWasm ? 1 : 0;
   }
+
+  void _handleSimpleInitialPageCheck() {
+    // Record whether the URL contains the expected initial page so we can
+    // verify the behavior of setting the `initialPage` on the benchmark server.
+    final bool containsExpectedPage =
+        window.location.toString().contains(testBenchmarkInitialPage);
+    profile.extraData['expectedUrl'] = containsExpectedPage ? 1 : 0;
+  }
 }
 
 const Duration _animationCheckingInterval = Duration(milliseconds: 50);
diff --git a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/simple_initial_page_client.dart b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/simple_initial_page_client.dart
new file mode 100644
index 00000000000..75bb8e31e7a
--- /dev/null
+++ b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/simple_initial_page_client.dart
@@ -0,0 +1,19 @@
+// Copyright 2013 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 'package:web_benchmarks/client.dart';
+
+import '../common.dart';
+import '../recorder.dart';
+
+Future<void> main() async {
+  await runBenchmarks(
+    <String, RecorderFactory>{
+      BenchmarkName.simpleInitialPageCheck.name: () => TestAppRecorder(
+            benchmark: BenchmarkName.simpleInitialPageCheck,
+          ),
+    },
+    initialPage: testBenchmarkInitialPage,
+  );
+}
diff --git a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/common.dart b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/common.dart
index 06667d8738d..eaba8cd1157 100644
--- a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/common.dart
+++ b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/common.dart
@@ -2,9 +2,12 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
+const String testBenchmarkInitialPage = 'index.html#about';
+
 enum BenchmarkName {
   appNavigate,
   appScroll,
   appTap,
+  simpleInitialPageCheck,
   simpleCompilationCheck;
 }
diff --git a/packages/web_benchmarks/testing/test_app/benchmark/web_benchmarks_test.dart b/packages/web_benchmarks/testing/test_app/benchmark/web_benchmarks_test.dart
index a42557b83a6..64b4f6061c8 100644
--- a/packages/web_benchmarks/testing/test_app/benchmark/web_benchmarks_test.dart
+++ b/packages/web_benchmarks/testing/test_app/benchmark/web_benchmarks_test.dart
@@ -32,19 +32,22 @@ Future<void> main() async {
     'Can run a web benchmark with an alternate initial page',
     () async {
       final BenchmarkResults results = await _runBenchmarks(
-        benchmarkNames: <String>['simple'],
-        entryPoint: 'lib/benchmarks/runner_simple.dart',
-        initialPage: 'index.html#about',
+        benchmarkNames: <String>[BenchmarkName.simpleInitialPageCheck.name],
+        entryPoint:
+            'benchmark/test_infra/client/simple_initial_page_client.dart',
+        initialPage: testBenchmarkInitialPage,
       );
 
-      // The simple runner just puts an `isWasm` metric in there so we can make
-      // sure that we're running in the right environment.
-      final List<BenchmarkScore>? scores = results.scores['simple'];
+      // The runner puts an `expectedUrl` metric in the results so that we can
+      // verify the initial page value that should be passed on initial load
+      // and on reloads.
+      final List<BenchmarkScore>? scores =
+          results.scores[BenchmarkName.simpleInitialPageCheck.name];
       expect(scores, isNotNull);
 
       final BenchmarkScore isWasmScore = scores!
-          .firstWhere((BenchmarkScore score) => score.metric == 'isWasm');
-      expect(isWasmScore.value, 0);
+          .firstWhere((BenchmarkScore score) => score.metric == 'expectedUrl');
+      expect(isWasmScore.value, 1);
     },
     timeout: Timeout.none,
   );
@@ -59,8 +62,8 @@ Future<void> main() async {
         compilationOptions: const CompilationOptions.wasm(),
       );
 
-      // The simple runner just puts an `isWasm` metric in there so we can make
-      // sure that we're running in the right environment.
+      // The runner puts an `isWasm` metric in the results so that we can verify
+      // we are running with the correct compiler and renderer.
       final List<BenchmarkScore>? scores =
           results.scores[BenchmarkName.simpleCompilationCheck.name];
       expect(scores, isNotNull);

From 956919c19fd0820496878478f6b1311389019927 Mon Sep 17 00:00:00 2001
From: Kenzie Davisson <kenzieschmoll@google.com>
Date: Thu, 12 Sep 2024 14:39:44 -0700
Subject: [PATCH 06/21] revert go router

---
 .../testing/test_app/lib/about_page.dart      |  3 +--
 .../testing/test_app/lib/home_page.dart       |  3 +--
 .../testing/test_app/lib/main.dart            | 23 ++++++-------------
 .../testing/test_app/pubspec.yaml             |  1 -
 4 files changed, 9 insertions(+), 21 deletions(-)

diff --git a/packages/web_benchmarks/testing/test_app/lib/about_page.dart b/packages/web_benchmarks/testing/test_app/lib/about_page.dart
index 23f85320eaf..a3603abeb55 100644
--- a/packages/web_benchmarks/testing/test_app/lib/about_page.dart
+++ b/packages/web_benchmarks/testing/test_app/lib/about_page.dart
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
 
 class AboutPage extends StatelessWidget {
   const AboutPage({super.key});
@@ -13,7 +12,7 @@ class AboutPage extends StatelessWidget {
     return Scaffold(
       appBar: AppBar(
         leading: BackButton(
-          onPressed: () => context.canPop() ? context.pop() : context.go('/'),
+          onPressed: () => Navigator.of(context).pop(),
         ),
       ),
       body: Center(
diff --git a/packages/web_benchmarks/testing/test_app/lib/home_page.dart b/packages/web_benchmarks/testing/test_app/lib/home_page.dart
index c0f7a131aec..2fecf2514e1 100644
--- a/packages/web_benchmarks/testing/test_app/lib/home_page.dart
+++ b/packages/web_benchmarks/testing/test_app/lib/home_page.dart
@@ -3,7 +3,6 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-import 'package:go_router/go_router.dart';
 
 const ValueKey<String> textKey = ValueKey<String>('textKey');
 const ValueKey<String> aboutPageKey = ValueKey<String>('aboutPageKey');
@@ -35,7 +34,7 @@ class _HomePageState extends State<HomePage> {
           IconButton(
             key: aboutPageKey,
             icon: const Icon(Icons.help_outline),
-            onPressed: () => context.go('/about'),
+            onPressed: () => Navigator.of(context).pushNamed('about'),
           ),
         ],
       ),
diff --git a/packages/web_benchmarks/testing/test_app/lib/main.dart b/packages/web_benchmarks/testing/test_app/lib/main.dart
index 172abba3288..d146a080abd 100644
--- a/packages/web_benchmarks/testing/test_app/lib/main.dart
+++ b/packages/web_benchmarks/testing/test_app/lib/main.dart
@@ -4,7 +4,6 @@
 
 import 'package:flutter/material.dart';
 import 'package:flutter_web_plugins/url_strategy.dart';
-import 'package:go_router/go_router.dart';
 
 import 'about_page.dart';
 import 'home_page.dart';
@@ -14,33 +13,25 @@ void main() {
   runApp(const MyApp());
 }
 
-final GoRouter _router = GoRouter(
-  routes: <GoRoute>[
-    GoRoute(
-      path: '/',
-      builder: (_, __) => const HomePage(title: 'Flutter Demo Home Page'),
-    ),
-    GoRoute(
-      path: '/about',
-      builder: (_, __) => const AboutPage(),
-    ),
-  ],
-);
-
 class MyApp extends StatelessWidget {
   const MyApp({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return MaterialApp.router(
+    return MaterialApp(
       title: 'Flutter Demo',
       theme: ThemeData(
         primarySwatch: Colors.blue,
         visualDensity: VisualDensity.adaptivePlatformDensity,
       ),
-      routerConfig: _router,
       // This blocks the About page button.
       debugShowCheckedModeBanner: false,
+      initialRoute: 'home',
+      routes: <String, WidgetBuilder>{
+        'home': (_) => const HomePage(title: 'Flutter Demo Home Page'),
+        'about': (_) => const AboutPage(),
+        'icon_generator': (_) => const IconGeneratorPage(),
+      },
     );
   }
 }
diff --git a/packages/web_benchmarks/testing/test_app/pubspec.yaml b/packages/web_benchmarks/testing/test_app/pubspec.yaml
index 58dffcd083e..a4de0db432d 100644
--- a/packages/web_benchmarks/testing/test_app/pubspec.yaml
+++ b/packages/web_benchmarks/testing/test_app/pubspec.yaml
@@ -13,7 +13,6 @@ dependencies:
     sdk: flutter
   flutter_web_plugins:
     sdk: flutter
-  go_router: ^14.2.7
 
 dev_dependencies:
   flutter_lints: ^4.0.0

From 998fd642cf27c157d879fd6c84054b28e7697df7 Mon Sep 17 00:00:00 2001
From: Kenzie Davisson <kenzieschmoll@google.com>
Date: Thu, 12 Sep 2024 14:41:27 -0700
Subject: [PATCH 07/21] remove path url strategy

---
 packages/web_benchmarks/testing/test_app/lib/main.dart | 2 --
 packages/web_benchmarks/testing/test_app/pubspec.yaml  | 2 --
 2 files changed, 4 deletions(-)

diff --git a/packages/web_benchmarks/testing/test_app/lib/main.dart b/packages/web_benchmarks/testing/test_app/lib/main.dart
index d146a080abd..611d0483ddf 100644
--- a/packages/web_benchmarks/testing/test_app/lib/main.dart
+++ b/packages/web_benchmarks/testing/test_app/lib/main.dart
@@ -3,13 +3,11 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
-import 'package:flutter_web_plugins/url_strategy.dart';
 
 import 'about_page.dart';
 import 'home_page.dart';
 
 void main() {
-  usePathUrlStrategy();
   runApp(const MyApp());
 }
 
diff --git a/packages/web_benchmarks/testing/test_app/pubspec.yaml b/packages/web_benchmarks/testing/test_app/pubspec.yaml
index a4de0db432d..50d6c08dcb7 100644
--- a/packages/web_benchmarks/testing/test_app/pubspec.yaml
+++ b/packages/web_benchmarks/testing/test_app/pubspec.yaml
@@ -11,8 +11,6 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
-  flutter_web_plugins:
-    sdk: flutter
 
 dev_dependencies:
   flutter_lints: ^4.0.0

From 0de0753de9064e65875dc5ac78fe23e8711f57c2 Mon Sep 17 00:00:00 2001
From: Kenzie Davisson <kenzieschmoll@google.com>
Date: Thu, 12 Sep 2024 14:42:04 -0700
Subject: [PATCH 08/21] remove unused route

---
 packages/web_benchmarks/testing/test_app/lib/main.dart | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/web_benchmarks/testing/test_app/lib/main.dart b/packages/web_benchmarks/testing/test_app/lib/main.dart
index 611d0483ddf..f615e761acb 100644
--- a/packages/web_benchmarks/testing/test_app/lib/main.dart
+++ b/packages/web_benchmarks/testing/test_app/lib/main.dart
@@ -28,7 +28,6 @@ class MyApp extends StatelessWidget {
       routes: <String, WidgetBuilder>{
         'home': (_) => const HomePage(title: 'Flutter Demo Home Page'),
         'about': (_) => const AboutPage(),
-        'icon_generator': (_) => const IconGeneratorPage(),
       },
     );
   }

From eb480e4ede2bdd838287610ec3ead3cc948ad694 Mon Sep 17 00:00:00 2001
From: Kenzie Davisson <kenzieschmoll@google.com>
Date: Thu, 12 Sep 2024 14:53:10 -0700
Subject: [PATCH 09/21] remove initial page

---
 .../benchmark/test_infra/client/simple_initial_page_client.dart  | 1 -
 1 file changed, 1 deletion(-)

diff --git a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/simple_initial_page_client.dart b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/simple_initial_page_client.dart
index 75bb8e31e7a..9bfd9cf3ae2 100644
--- a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/simple_initial_page_client.dart
+++ b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/simple_initial_page_client.dart
@@ -14,6 +14,5 @@ Future<void> main() async {
             benchmark: BenchmarkName.simpleInitialPageCheck,
           ),
     },
-    initialPage: testBenchmarkInitialPage,
   );
 }

From 8a6631b093502207913abc91d0856ccd1715765a Mon Sep 17 00:00:00 2001
From: Kenzie Davisson <kenzieschmoll@google.com>
Date: Thu, 12 Sep 2024 14:54:04 -0700
Subject: [PATCH 10/21] versions

---
 packages/web_benchmarks/CHANGELOG.md | 2 +-
 packages/web_benchmarks/pubspec.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/web_benchmarks/CHANGELOG.md b/packages/web_benchmarks/CHANGELOG.md
index a8b4eb16091..9afb5e58ce2 100644
--- a/packages/web_benchmarks/CHANGELOG.md
+++ b/packages/web_benchmarks/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 3.0.0-wip
+## 2.1.0-wip
 
 * Restructure the `testing/test_app` to make the example benchmarks easier to follow.
 
diff --git a/packages/web_benchmarks/pubspec.yaml b/packages/web_benchmarks/pubspec.yaml
index 0bc109d17d3..fb8f9df26df 100644
--- a/packages/web_benchmarks/pubspec.yaml
+++ b/packages/web_benchmarks/pubspec.yaml
@@ -2,7 +2,7 @@ name: web_benchmarks
 description: A benchmark harness for performance-testing Flutter apps in Chrome.
 repository: https://github.com/flutter/packages/tree/main/packages/web_benchmarks
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+web_benchmarks%22
-version: 3.0.0-wip
+version: 2.1.0-wip
 
 environment:
   sdk: ^3.3.0

From 268e261ab1760205e329325c50bfb81718b8e755 Mon Sep 17 00:00:00 2001
From: Kenzie Davisson <kenzieschmoll@google.com>
Date: Thu, 12 Sep 2024 15:00:18 -0700
Subject: [PATCH 11/21] test version

---
 packages/web_benchmarks/testing/test_app/pubspec.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/web_benchmarks/testing/test_app/pubspec.yaml b/packages/web_benchmarks/testing/test_app/pubspec.yaml
index 50d6c08dcb7..953b188efce 100644
--- a/packages/web_benchmarks/testing/test_app/pubspec.yaml
+++ b/packages/web_benchmarks/testing/test_app/pubspec.yaml
@@ -16,7 +16,7 @@ dev_dependencies:
   flutter_lints: ^4.0.0
   flutter_test:
     sdk: flutter
-  test: ^1.25.8
+  test: ^1.19.5
   web: ">=0.5.1 <2.0.0"
   web_benchmarks:
     path: ../../

From 9cab2690be05470f8a4dcecfd66e1eed1f816f39 Mon Sep 17 00:00:00 2001
From: Kenzie Davisson <kenzieschmoll@google.com>
Date: Thu, 12 Sep 2024 15:25:53 -0700
Subject: [PATCH 12/21] spelling

---
 .../testing/test_app/benchmark/test_infra/automator.dart    | 4 ++--
 .../testing/test_app/benchmark/test_infra/recorder.dart     | 6 +++---
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/automator.dart b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/automator.dart
index 45cc5082efb..4184a8a7430 100644
--- a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/automator.dart
+++ b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/automator.dart
@@ -17,8 +17,8 @@ import 'package:web_benchmarks/client.dart';
 import 'common.dart';
 
 /// A class that automates the test web app.
-class Automater {
-  Automater({
+class Automator {
+  Automator({
     required this.benchmark,
     required this.stopWarmingUpCallback,
     required this.profile,
diff --git a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/recorder.dart b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/recorder.dart
index ba0dc55ba30..8b0abd0d125 100644
--- a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/recorder.dart
+++ b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/recorder.dart
@@ -18,17 +18,17 @@ class TestAppRecorder extends WidgetRecorder {
   /// See `common.dart` for the list of the names of all benchmarks.
   final BenchmarkName benchmark;
 
-  Automater? _automator;
+  Automator? _automator;
   bool get _finished => _automator?.finished ?? false;
 
   /// Whether we should continue recording.
   @override
   bool shouldContinue() => !_finished || profile.shouldContinue();
 
-  /// Creates the [Automater] widget.
+  /// Creates the [Automator] widget.
   @override
   Widget createWidget() {
-    _automator = Automater(
+    _automator = Automator(
       benchmark: benchmark,
       stopWarmingUpCallback: profile.stopWarmingUp,
       profile: profile,

From 463d875cd7def94064508811d41f74f45fa51e1f Mon Sep 17 00:00:00 2001
From: Kenzie Davisson <kenzieschmoll@google.com>
Date: Thu, 12 Sep 2024 16:21:55 -0700
Subject: [PATCH 13/21] add license

---
 packages/web_benchmarks/testing/test_app/web/index.html | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/packages/web_benchmarks/testing/test_app/web/index.html b/packages/web_benchmarks/testing/test_app/web/index.html
index 98fc61ffe20..cc7ef836e2f 100644
--- a/packages/web_benchmarks/testing/test_app/web/index.html
+++ b/packages/web_benchmarks/testing/test_app/web/index.html
@@ -1,4 +1,7 @@
 <!DOCTYPE html>
+<!-- Copyright 2013 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. -->
 <html>
 <head>
   <!--

From ca251faa1a6fd65167a8ba82dd910c5fbed7b5de Mon Sep 17 00:00:00 2001
From: Kenzie Davisson <kenzieschmoll@google.com>
Date: Thu, 12 Sep 2024 16:29:00 -0700
Subject: [PATCH 14/21] Replace `initialPage` parameter with `benchmarkPath`.

---
 packages/web_benchmarks/CHANGELOG.md          |  5 +++-
 packages/web_benchmarks/lib/client.dart       | 22 ++++++++------
 packages/web_benchmarks/lib/server.dart       |  7 +++--
 packages/web_benchmarks/lib/src/common.dart   |  6 ++--
 packages/web_benchmarks/lib/src/runner.dart   | 29 ++++++++++++++-----
 packages/web_benchmarks/pubspec.yaml          |  2 +-
 .../benchmark/test_infra/automator.dart       | 16 +++++-----
 ...dart => simple_benchmark_path_client.dart} |  4 +--
 .../test_app/benchmark/test_infra/common.dart |  6 ++--
 .../benchmark/web_benchmarks_test.dart        | 24 +++++++--------
 10 files changed, 74 insertions(+), 47 deletions(-)
 rename packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/{simple_initial_page_client.dart => simple_benchmark_path_client.dart} (73%)

diff --git a/packages/web_benchmarks/CHANGELOG.md b/packages/web_benchmarks/CHANGELOG.md
index 9afb5e58ce2..8616c7af000 100644
--- a/packages/web_benchmarks/CHANGELOG.md
+++ b/packages/web_benchmarks/CHANGELOG.md
@@ -1,5 +1,8 @@
-## 2.1.0-wip
+## 3.0.0-wip
 
+* **Breaking change:** removed the `initialPage` parameter from the `serveWebBenchmark`
+method and `runBenchmarks` method. Replaced this parameter with `benchmarkPath`, which
+allows for passing the combined value of the URL path segments, fragment, and query parameters.
 * Restructure the `testing/test_app` to make the example benchmarks easier to follow.
 
 ## 2.0.2
diff --git a/packages/web_benchmarks/lib/client.dart b/packages/web_benchmarks/lib/client.dart
index 9bdd65b0414..8cb66739318 100644
--- a/packages/web_benchmarks/lib/client.dart
+++ b/packages/web_benchmarks/lib/client.dart
@@ -41,9 +41,12 @@ extension on HTMLElement {
 ///
 /// When used without a server, prompts the user to select a benchmark to
 /// run next.
+///
+/// [benchmarkPath] spcifies the path for the URL that will be loaded in Chrome
+/// when reloading the window for subsequent benchmark runs.
 Future<void> runBenchmarks(
   Map<String, RecorderFactory> benchmarks, {
-  String initialPage = defaultInitialPage,
+  String benchmarkPath = defaultInitialPath,
 }) async {
   // Set local benchmarks.
   _benchmarks = benchmarks;
@@ -60,14 +63,15 @@ Future<void> runBenchmarks(
   await _runBenchmark(nextBenchmark);
 
   final Uri currentUri = Uri.parse(window.location.href);
-  // Create a new URI with the current 'page' value set to [initialPage] to
-  // ensure the benchmark app is reloaded at the proper location.
-  final String newUri = Uri(
-    scheme: currentUri.scheme,
-    host: currentUri.host,
-    port: currentUri.port,
-    path: initialPage,
-  ).toString();
+  // Create a new URI with the parsed value of [benchmarkPath] to ensure the
+  // benchmark app is reloaded with the proper configuration.
+  final String newUri = Uri.parse(benchmarkPath)
+      .replace(
+        scheme: currentUri.scheme,
+        host: currentUri.host,
+        port: currentUri.port,
+      )
+      .toString();
 
   // Reloading the window will trigger the next benchmark to run.
   await _client.printToConsole(
diff --git a/packages/web_benchmarks/lib/server.dart b/packages/web_benchmarks/lib/server.dart
index 80e5f7a4f50..eeb5ee5a83d 100644
--- a/packages/web_benchmarks/lib/server.dart
+++ b/packages/web_benchmarks/lib/server.dart
@@ -47,6 +47,9 @@ const int defaultChromeDebugPort = 10000;
 /// [compilationOptions] specify the compiler and renderer to use for the
 /// benchmark app. This can either use dart2wasm & skwasm or
 /// dart2js & canvaskit.
+///
+/// [benchmarkPath] spcifies the path for the URL that will be loaded upon
+/// opening the benchmark app in Chrome.
 Future<BenchmarkResults> serveWebBenchmark({
   required io.Directory benchmarkAppDirectory,
   required String entryPoint,
@@ -54,8 +57,8 @@ Future<BenchmarkResults> serveWebBenchmark({
   int chromeDebugPort = defaultChromeDebugPort,
   bool headless = true,
   bool treeShakeIcons = true,
-  String initialPage = defaultInitialPage,
   CompilationOptions compilationOptions = const CompilationOptions.js(),
+  String benchmarkPath = defaultInitialPath,
 }) async {
   // Reduce logging level. Otherwise, package:webkit_inspection_protocol is way too spammy.
   Logger.root.level = Level.INFO;
@@ -64,10 +67,10 @@ Future<BenchmarkResults> serveWebBenchmark({
     benchmarkAppDirectory: benchmarkAppDirectory,
     entryPoint: entryPoint,
     benchmarkServerPort: benchmarkServerPort,
+    benchmarkPath: benchmarkPath,
     chromeDebugPort: chromeDebugPort,
     headless: headless,
     compilationOptions: compilationOptions,
     treeShakeIcons: treeShakeIcons,
-    initialPage: initialPage,
   ).run();
 }
diff --git a/packages/web_benchmarks/lib/src/common.dart b/packages/web_benchmarks/lib/src/common.dart
index 5c7c7259796..a32f65c77da 100644
--- a/packages/web_benchmarks/lib/src/common.dart
+++ b/packages/web_benchmarks/lib/src/common.dart
@@ -15,6 +15,6 @@ const int kMeasuredSampleCount = 100;
 /// all benchmarks have run and there are no more benchmarks to run.
 const String kEndOfBenchmarks = '__end_of_benchmarks__';
 
-/// The default initial page to load upon opening the benchmark app or reloading
-/// it in Chrome.
-const String defaultInitialPage = 'index.html';
+/// The default initial path for the URL that will be loaded upon opening the
+/// benchmark app or reloading it in Chrome.
+const String defaultInitialPath = 'index.html';
diff --git a/packages/web_benchmarks/lib/src/runner.dart b/packages/web_benchmarks/lib/src/runner.dart
index 0c929104622..8d3b7c7090c 100644
--- a/packages/web_benchmarks/lib/src/runner.dart
+++ b/packages/web_benchmarks/lib/src/runner.dart
@@ -53,6 +53,9 @@ class BenchmarkServer {
   /// [compilationOptions] specify the compiler and renderer to use for the
   /// benchmark app. This can either use dart2wasm & skwasm or
   /// dart2js & canvaskit.
+  /// 
+  /// [benchmarkPath] spcifies the path for the URL that will be loaded upon
+  /// opening the benchmark app in Chrome.
   BenchmarkServer({
     required this.benchmarkAppDirectory,
     required this.entryPoint,
@@ -61,7 +64,7 @@ class BenchmarkServer {
     required this.headless,
     required this.treeShakeIcons,
     this.compilationOptions = const CompilationOptions.js(),
-    this.initialPage = defaultInitialPage,
+    this.benchmarkPath = defaultInitialPath,
   });
 
   final ProcessManager _processManager = const LocalProcessManager();
@@ -97,13 +100,25 @@ class BenchmarkServer {
   /// When false, '--no-tree-shake-icons' will be passed as a build argument.
   final bool treeShakeIcons;
 
-  /// The initial page to load upon opening the benchmark app in Chrome.
+  /// The initial path for the URL that will be loaded upon opening the
+  /// benchmark app in Chrome.
   ///
-  /// The default value is [defaultInitialPage].
-  final String initialPage;
-
-  String get _benchmarkAppUrl =>
-      'http://localhost:$benchmarkServerPort/$initialPage';
+  /// This path should contain the path segments, fragment, and/or query
+  /// parameters that are required for the benchmark. This value will be parsed
+  /// by `Uri.parse` and combined with the benchmark URI scheme ('http'), host
+  /// ('localhost'), and port [benchmarkServerPort] to create the URL for
+  /// loading in Chrome. See [_benchmarkAppUrl].
+  ///
+  /// The default value is [defaultInitialPath].
+  final String benchmarkPath;
+
+  String get _benchmarkAppUrl => Uri.parse(benchmarkPath)
+      .replace(
+        scheme: 'http',
+        host: 'localhost',
+        port: benchmarkServerPort,
+      )
+      .toString();
 
   /// Builds and serves the benchmark app, and collects benchmark results.
   Future<BenchmarkResults> run() async {
diff --git a/packages/web_benchmarks/pubspec.yaml b/packages/web_benchmarks/pubspec.yaml
index fb8f9df26df..0bc109d17d3 100644
--- a/packages/web_benchmarks/pubspec.yaml
+++ b/packages/web_benchmarks/pubspec.yaml
@@ -2,7 +2,7 @@ name: web_benchmarks
 description: A benchmark harness for performance-testing Flutter apps in Chrome.
 repository: https://github.com/flutter/packages/tree/main/packages/web_benchmarks
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+web_benchmarks%22
-version: 2.1.0-wip
+version: 3.0.0-wip
 
 environment:
   sdk: ^3.3.0
diff --git a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/automator.dart b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/automator.dart
index 4184a8a7430..9484a544144 100644
--- a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/automator.dart
+++ b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/automator.dart
@@ -59,8 +59,8 @@ class Automator {
         await _handleAppTap();
       case BenchmarkName.simpleCompilationCheck:
         _handleSimpleCompilationCheck();
-      case BenchmarkName.simpleInitialPageCheck:
-        _handleSimpleInitialPageCheck();
+      case BenchmarkName.simpleBenchmarkPathCheck:
+        _handleSimpleBenchmarkPathCheck();
     }
 
     // At the end of the test, mark as finished.
@@ -117,12 +117,12 @@ class Automator {
     profile.extraData['isWasm'] = kIsWasm ? 1 : 0;
   }
 
-  void _handleSimpleInitialPageCheck() {
-    // Record whether the URL contains the expected initial page so we can
-    // verify the behavior of setting the `initialPage` on the benchmark server.
-    final bool containsExpectedPage =
-        window.location.toString().contains(testBenchmarkInitialPage);
-    profile.extraData['expectedUrl'] = containsExpectedPage ? 1 : 0;
+  void _handleSimpleBenchmarkPathCheck() {
+    // Record whether the URL contains the expected path so we can verify the
+    // behavior of setting the `benchmarkPath` on the benchmark server.
+    final bool containsExpectedPath =
+        window.location.toString().contains(testBenchmarkPath);
+    profile.extraData['expectedUrl'] = containsExpectedPath ? 1 : 0;
   }
 }
 
diff --git a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/simple_initial_page_client.dart b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/simple_benchmark_path_client.dart
similarity index 73%
rename from packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/simple_initial_page_client.dart
rename to packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/simple_benchmark_path_client.dart
index 9bfd9cf3ae2..5215a51f0f6 100644
--- a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/simple_initial_page_client.dart
+++ b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/simple_benchmark_path_client.dart
@@ -10,8 +10,8 @@ import '../recorder.dart';
 Future<void> main() async {
   await runBenchmarks(
     <String, RecorderFactory>{
-      BenchmarkName.simpleInitialPageCheck.name: () => TestAppRecorder(
-            benchmark: BenchmarkName.simpleInitialPageCheck,
+      BenchmarkName.simpleBenchmarkPathCheck.name: () => TestAppRecorder(
+            benchmark: BenchmarkName.simpleBenchmarkPathCheck,
           ),
     },
   );
diff --git a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/common.dart b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/common.dart
index eaba8cd1157..77f0972519b 100644
--- a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/common.dart
+++ b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/common.dart
@@ -2,12 +2,14 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-const String testBenchmarkInitialPage = 'index.html#about';
+/// The benchmark path to load in the URL when loading or reloading the
+/// benchmark app in Chrome.
+const String testBenchmarkPath = 'about?foo=bar';
 
 enum BenchmarkName {
   appNavigate,
   appScroll,
   appTap,
-  simpleInitialPageCheck,
+  simpleBenchmarkPathCheck,
   simpleCompilationCheck;
 }
diff --git a/packages/web_benchmarks/testing/test_app/benchmark/web_benchmarks_test.dart b/packages/web_benchmarks/testing/test_app/benchmark/web_benchmarks_test.dart
index 64b4f6061c8..63b33dc8a14 100644
--- a/packages/web_benchmarks/testing/test_app/benchmark/web_benchmarks_test.dart
+++ b/packages/web_benchmarks/testing/test_app/benchmark/web_benchmarks_test.dart
@@ -29,25 +29,25 @@ Future<void> main() async {
   );
 
   test(
-    'Can run a web benchmark with an alternate initial page',
+    'Can run a web benchmark with an alternate benchmarkPath',
     () async {
       final BenchmarkResults results = await _runBenchmarks(
-        benchmarkNames: <String>[BenchmarkName.simpleInitialPageCheck.name],
+        benchmarkNames: <String>[BenchmarkName.simpleBenchmarkPathCheck.name],
         entryPoint:
-            'benchmark/test_infra/client/simple_initial_page_client.dart',
-        initialPage: testBenchmarkInitialPage,
+            'benchmark/test_infra/client/simple_benchmark_path_client.dart',
+        benchmarkPath: testBenchmarkPath,
       );
 
-      // The runner puts an `expectedUrl` metric in the results so that we can
-      // verify the initial page value that should be passed on initial load
-      // and on reloads.
       final List<BenchmarkScore>? scores =
-          results.scores[BenchmarkName.simpleInitialPageCheck.name];
+          results.scores[BenchmarkName.simpleBenchmarkPathCheck.name];
       expect(scores, isNotNull);
 
-      final BenchmarkScore isWasmScore = scores!
+      // The runner puts an `expectedUrl` metric in the results so that we can
+      // verify the initial page value that should be passed on initial load
+      // and on reloads.
+      final BenchmarkScore expectedUrlScore = scores!
           .firstWhere((BenchmarkScore score) => score.metric == 'expectedUrl');
-      expect(isWasmScore.value, 1);
+      expect(expectedUrlScore.value, 1);
     },
     timeout: Timeout.none,
   );
@@ -79,14 +79,14 @@ Future<void> main() async {
 Future<BenchmarkResults> _runBenchmarks({
   required List<String> benchmarkNames,
   required String entryPoint,
-  String initialPage = defaultInitialPage,
+  String benchmarkPath = defaultInitialPath,
   CompilationOptions compilationOptions = const CompilationOptions.js(),
 }) async {
   final BenchmarkResults taskResult = await serveWebBenchmark(
     benchmarkAppDirectory: Directory('testing/test_app'),
     entryPoint: entryPoint,
     treeShakeIcons: false,
-    initialPage: initialPage,
+    benchmarkPath: benchmarkPath,
     compilationOptions: compilationOptions,
   );
 

From ab2916c85e921eef0db5a61dedc8c3608d857d86 Mon Sep 17 00:00:00 2001
From: Kenzie Davisson <kenzieschmoll@google.com>
Date: Thu, 12 Sep 2024 17:00:24 -0700
Subject: [PATCH 15/21] revert change

---
 .../testing/test_app/benchmark/test_infra/common.dart           | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/common.dart b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/common.dart
index 77f0972519b..89beba31dfb 100644
--- a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/common.dart
+++ b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/common.dart
@@ -4,7 +4,7 @@
 
 /// The benchmark path to load in the URL when loading or reloading the
 /// benchmark app in Chrome.
-const String testBenchmarkPath = 'about?foo=bar';
+const String testBenchmarkPath = 'index.html#about';
 
 enum BenchmarkName {
   appNavigate,

From 2c8dee31f55561d607f5096a4c02ae2bab3f59b2 Mon Sep 17 00:00:00 2001
From: Kenzie Davisson <kenzieschmoll@google.com>
Date: Fri, 27 Sep 2024 12:23:42 -0700
Subject: [PATCH 16/21] use go_router for test app

---
 .../testing/test_app/lib/about_page.dart      |  3 ++-
 .../testing/test_app/lib/home_page.dart       |  3 ++-
 .../testing/test_app/lib/main.dart            | 24 ++++++++++++++-----
 .../testing/test_app/pubspec.yaml             |  3 +++
 4 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/packages/web_benchmarks/testing/test_app/lib/about_page.dart b/packages/web_benchmarks/testing/test_app/lib/about_page.dart
index a3603abeb55..23f85320eaf 100644
--- a/packages/web_benchmarks/testing/test_app/lib/about_page.dart
+++ b/packages/web_benchmarks/testing/test_app/lib/about_page.dart
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 
 class AboutPage extends StatelessWidget {
   const AboutPage({super.key});
@@ -12,7 +13,7 @@ class AboutPage extends StatelessWidget {
     return Scaffold(
       appBar: AppBar(
         leading: BackButton(
-          onPressed: () => Navigator.of(context).pop(),
+          onPressed: () => context.canPop() ? context.pop() : context.go('/'),
         ),
       ),
       body: Center(
diff --git a/packages/web_benchmarks/testing/test_app/lib/home_page.dart b/packages/web_benchmarks/testing/test_app/lib/home_page.dart
index 2fecf2514e1..c0f7a131aec 100644
--- a/packages/web_benchmarks/testing/test_app/lib/home_page.dart
+++ b/packages/web_benchmarks/testing/test_app/lib/home_page.dart
@@ -3,6 +3,7 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
+import 'package:go_router/go_router.dart';
 
 const ValueKey<String> textKey = ValueKey<String>('textKey');
 const ValueKey<String> aboutPageKey = ValueKey<String>('aboutPageKey');
@@ -34,7 +35,7 @@ class _HomePageState extends State<HomePage> {
           IconButton(
             key: aboutPageKey,
             icon: const Icon(Icons.help_outline),
-            onPressed: () => Navigator.of(context).pushNamed('about'),
+            onPressed: () => context.go('/about'),
           ),
         ],
       ),
diff --git a/packages/web_benchmarks/testing/test_app/lib/main.dart b/packages/web_benchmarks/testing/test_app/lib/main.dart
index f615e761acb..172abba3288 100644
--- a/packages/web_benchmarks/testing/test_app/lib/main.dart
+++ b/packages/web_benchmarks/testing/test_app/lib/main.dart
@@ -3,32 +3,44 @@
 // found in the LICENSE file.
 
 import 'package:flutter/material.dart';
+import 'package:flutter_web_plugins/url_strategy.dart';
+import 'package:go_router/go_router.dart';
 
 import 'about_page.dart';
 import 'home_page.dart';
 
 void main() {
+  usePathUrlStrategy();
   runApp(const MyApp());
 }
 
+final GoRouter _router = GoRouter(
+  routes: <GoRoute>[
+    GoRoute(
+      path: '/',
+      builder: (_, __) => const HomePage(title: 'Flutter Demo Home Page'),
+    ),
+    GoRoute(
+      path: '/about',
+      builder: (_, __) => const AboutPage(),
+    ),
+  ],
+);
+
 class MyApp extends StatelessWidget {
   const MyApp({super.key});
 
   @override
   Widget build(BuildContext context) {
-    return MaterialApp(
+    return MaterialApp.router(
       title: 'Flutter Demo',
       theme: ThemeData(
         primarySwatch: Colors.blue,
         visualDensity: VisualDensity.adaptivePlatformDensity,
       ),
+      routerConfig: _router,
       // This blocks the About page button.
       debugShowCheckedModeBanner: false,
-      initialRoute: 'home',
-      routes: <String, WidgetBuilder>{
-        'home': (_) => const HomePage(title: 'Flutter Demo Home Page'),
-        'about': (_) => const AboutPage(),
-      },
     );
   }
 }
diff --git a/packages/web_benchmarks/testing/test_app/pubspec.yaml b/packages/web_benchmarks/testing/test_app/pubspec.yaml
index 953b188efce..902f1e0ba9c 100644
--- a/packages/web_benchmarks/testing/test_app/pubspec.yaml
+++ b/packages/web_benchmarks/testing/test_app/pubspec.yaml
@@ -11,6 +11,9 @@ environment:
 dependencies:
   flutter:
     sdk: flutter
+  flutter_web_plugins:
+    sdk: flutter
+  go_router: ^14.2.7
 
 dev_dependencies:
   flutter_lints: ^4.0.0

From e50965883d5273606cabcba979f7f918025bbaac Mon Sep 17 00:00:00 2001
From: Kenzie Davisson <kenzieschmoll@google.com>
Date: Mon, 30 Sep 2024 10:58:26 -0700
Subject: [PATCH 17/21] Create .gitignore

---
 packages/web_benchmarks/.gitignore | 1 +
 1 file changed, 1 insertion(+)
 create mode 100644 packages/web_benchmarks/.gitignore

diff --git a/packages/web_benchmarks/.gitignore b/packages/web_benchmarks/.gitignore
new file mode 100644
index 00000000000..333c1e910a3
--- /dev/null
+++ b/packages/web_benchmarks/.gitignore
@@ -0,0 +1 @@
+logs/

From aa7589086818aed18c917ebc597a832ec4c955ee Mon Sep 17 00:00:00 2001
From: Kenzie Davisson <kenzieschmoll@google.com>
Date: Mon, 30 Sep 2024 11:59:55 -0700
Subject: [PATCH 18/21] Handle requests for the app under test

---
 packages/web_benchmarks/lib/src/runner.dart   | 20 +++++++++++++++----
 .../client/simple_benchmark_path_client.dart  |  1 +
 .../test_app/benchmark/test_infra/common.dart |  2 +-
 3 files changed, 18 insertions(+), 5 deletions(-)

diff --git a/packages/web_benchmarks/lib/src/runner.dart b/packages/web_benchmarks/lib/src/runner.dart
index 8d3b7c7090c..48ac3bd41a3 100644
--- a/packages/web_benchmarks/lib/src/runner.dart
+++ b/packages/web_benchmarks/lib/src/runner.dart
@@ -53,7 +53,7 @@ class BenchmarkServer {
   /// [compilationOptions] specify the compiler and renderer to use for the
   /// benchmark app. This can either use dart2wasm & skwasm or
   /// dart2js & canvaskit.
-  /// 
+  ///
   /// [benchmarkPath] spcifies the path for the URL that will be loaded upon
   /// opening the benchmark app in Chrome.
   BenchmarkServer({
@@ -184,6 +184,7 @@ class BenchmarkServer {
       path.join(benchmarkAppDirectory.path, 'build', 'web'),
       defaultDocument: 'index.html',
     );
+
     // We want our page to be crossOriginIsolated. This will allow us to run the
     // skwasm renderer, which uses a SharedArrayBuffer, which requires the page
     // to be crossOriginIsolated. But also, even in the non-skwasm case, running
@@ -292,9 +293,20 @@ class BenchmarkServer {
       }
     });
 
-    // If all previous handlers returned HTTP 404, this is the last handler
-    // that simply warns about the unrecognized path.
-    cascade = cascade.add((Request request) {
+    // If all previous handlers returned HTTP 404, this handler either serves
+    // the static handler at the default document (for GET requests only) or
+    // warns about the unrecognized path.
+    cascade = cascade.add((Request request) async {
+      if (request.method == 'GET') {
+        final Uri newRequestUri = request.requestedUri.replace(path: '/');
+        final Request newRequest = Request(
+          request.method,
+          newRequestUri,
+          headers: request.headers,
+        );
+        return await buildFolderHandler(newRequest);
+      }
+
       io.stderr.writeln('Unrecognized URL path: ${request.requestedUri.path}');
       return Response.notFound('Not found: ${request.requestedUri.path}');
     });
diff --git a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/simple_benchmark_path_client.dart b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/simple_benchmark_path_client.dart
index 5215a51f0f6..f8f54492c3e 100644
--- a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/simple_benchmark_path_client.dart
+++ b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/simple_benchmark_path_client.dart
@@ -14,5 +14,6 @@ Future<void> main() async {
             benchmark: BenchmarkName.simpleBenchmarkPathCheck,
           ),
     },
+    benchmarkPath: testBenchmarkPath,
   );
 }
diff --git a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/common.dart b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/common.dart
index 89beba31dfb..8045852f64d 100644
--- a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/common.dart
+++ b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/common.dart
@@ -4,7 +4,7 @@
 
 /// The benchmark path to load in the URL when loading or reloading the
 /// benchmark app in Chrome.
-const String testBenchmarkPath = 'index.html#about';
+const String testBenchmarkPath = 'about';
 
 enum BenchmarkName {
   appNavigate,

From a17cc95ca5bd970591ce8e5e7283a5f662fe0f07 Mon Sep 17 00:00:00 2001
From: Kenzie Davisson <kenzieschmoll@google.com>
Date: Mon, 30 Sep 2024 12:05:29 -0700
Subject: [PATCH 19/21] spelling

---
 packages/web_benchmarks/lib/client.dart     | 2 +-
 packages/web_benchmarks/lib/server.dart     | 2 +-
 packages/web_benchmarks/lib/src/runner.dart | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/packages/web_benchmarks/lib/client.dart b/packages/web_benchmarks/lib/client.dart
index 8cb66739318..357d2bb8f19 100644
--- a/packages/web_benchmarks/lib/client.dart
+++ b/packages/web_benchmarks/lib/client.dart
@@ -42,7 +42,7 @@ extension on HTMLElement {
 /// When used without a server, prompts the user to select a benchmark to
 /// run next.
 ///
-/// [benchmarkPath] spcifies the path for the URL that will be loaded in Chrome
+/// [benchmarkPath] specifies the path for the URL that will be loaded in Chrome
 /// when reloading the window for subsequent benchmark runs.
 Future<void> runBenchmarks(
   Map<String, RecorderFactory> benchmarks, {
diff --git a/packages/web_benchmarks/lib/server.dart b/packages/web_benchmarks/lib/server.dart
index eeb5ee5a83d..8a52c9717c8 100644
--- a/packages/web_benchmarks/lib/server.dart
+++ b/packages/web_benchmarks/lib/server.dart
@@ -48,7 +48,7 @@ const int defaultChromeDebugPort = 10000;
 /// benchmark app. This can either use dart2wasm & skwasm or
 /// dart2js & canvaskit.
 ///
-/// [benchmarkPath] spcifies the path for the URL that will be loaded upon
+/// [benchmarkPath] specifies the path for the URL that will be loaded upon
 /// opening the benchmark app in Chrome.
 Future<BenchmarkResults> serveWebBenchmark({
   required io.Directory benchmarkAppDirectory,
diff --git a/packages/web_benchmarks/lib/src/runner.dart b/packages/web_benchmarks/lib/src/runner.dart
index 48ac3bd41a3..a78ef20bbc4 100644
--- a/packages/web_benchmarks/lib/src/runner.dart
+++ b/packages/web_benchmarks/lib/src/runner.dart
@@ -54,7 +54,7 @@ class BenchmarkServer {
   /// benchmark app. This can either use dart2wasm & skwasm or
   /// dart2js & canvaskit.
   ///
-  /// [benchmarkPath] spcifies the path for the URL that will be loaded upon
+  /// [benchmarkPath] specifies the path for the URL that will be loaded upon
   /// opening the benchmark app in Chrome.
   BenchmarkServer({
     required this.benchmarkAppDirectory,

From f52221c3085044adbd7f38f35108331bd0dd0f1b Mon Sep 17 00:00:00 2001
From: Kenzie Davisson <kenzieschmoll@google.com>
Date: Mon, 30 Sep 2024 12:06:50 -0700
Subject: [PATCH 20/21] Prep for publish

---
 packages/web_benchmarks/CHANGELOG.md | 2 +-
 packages/web_benchmarks/pubspec.yaml | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/packages/web_benchmarks/CHANGELOG.md b/packages/web_benchmarks/CHANGELOG.md
index 8616c7af000..e399fd367ee 100644
--- a/packages/web_benchmarks/CHANGELOG.md
+++ b/packages/web_benchmarks/CHANGELOG.md
@@ -1,4 +1,4 @@
-## 3.0.0-wip
+## 3.0.0
 
 * **Breaking change:** removed the `initialPage` parameter from the `serveWebBenchmark`
 method and `runBenchmarks` method. Replaced this parameter with `benchmarkPath`, which
diff --git a/packages/web_benchmarks/pubspec.yaml b/packages/web_benchmarks/pubspec.yaml
index 0bc109d17d3..94964f30230 100644
--- a/packages/web_benchmarks/pubspec.yaml
+++ b/packages/web_benchmarks/pubspec.yaml
@@ -2,7 +2,7 @@ name: web_benchmarks
 description: A benchmark harness for performance-testing Flutter apps in Chrome.
 repository: https://github.com/flutter/packages/tree/main/packages/web_benchmarks
 issue_tracker: https://github.com/flutter/flutter/issues?q=is%3Aissue+is%3Aopen+label%3A%22p%3A+web_benchmarks%22
-version: 3.0.0-wip
+version: 3.0.0
 
 environment:
   sdk: ^3.3.0

From 0e88a03773ec82f9670050a026c9276dfa4fc23e Mon Sep 17 00:00:00 2001
From: Kenzie Davisson <kenzieschmoll@google.com>
Date: Mon, 30 Sep 2024 12:33:38 -0700
Subject: [PATCH 21/21] delete file

---
 .../client/simple_initial_page_client.dart     | 18 ------------------
 1 file changed, 18 deletions(-)
 delete mode 100644 packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/simple_initial_page_client.dart

diff --git a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/simple_initial_page_client.dart b/packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/simple_initial_page_client.dart
deleted file mode 100644
index 9bfd9cf3ae2..00000000000
--- a/packages/web_benchmarks/testing/test_app/benchmark/test_infra/client/simple_initial_page_client.dart
+++ /dev/null
@@ -1,18 +0,0 @@
-// Copyright 2013 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 'package:web_benchmarks/client.dart';
-
-import '../common.dart';
-import '../recorder.dart';
-
-Future<void> main() async {
-  await runBenchmarks(
-    <String, RecorderFactory>{
-      BenchmarkName.simpleInitialPageCheck.name: () => TestAppRecorder(
-            benchmark: BenchmarkName.simpleInitialPageCheck,
-          ),
-    },
-  );
-}