Reorganize chart pane controller code and prepare structure for offline mode.

packages/devtools_app/lib/src/screens/memory/framework/memory_controller.dart

@@ -100,6 +100,9 @@ class MemoryController extends DisposableController
           createData: (json) => OfflineMemoryData.parse(json),
           shouldLoad: (data) => true,
         );
+        // [maybeLoadOfflineData] will be a noop if there is no offline data for the memory screen,
+        //  so ensure we still call [_initializedData] if it has not been called.
+        if (!_initialized.isCompleted) _initializeData();
         assert(_initialized.isCompleted);
     }
     assert(_initialized.isCompleted);

packages/devtools_app/lib/src/screens/memory/framework/screen_body.dart

@@ -2,8 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'dart:async';
-
 import 'package:devtools_app_shared/ui.dart';
 import 'package:devtools_app_shared/utils.dart';
 import 'package:flutter/material.dart';
@@ -33,19 +31,10 @@ class _ConnectedMemoryBodyState extends State<ConnectedMemoryBody>
 
   final _focusNode = FocusNode(debugLabel: 'memory');
 
-  bool _initialized = false;
-
   @override
   void initState() {
     super.initState();
     autoDisposeFocusNode(_focusNode);
-    unawaited(_init());
-  }
-
-  Future<void> _init() async {
-    await memoryController.initialized;
-    _initialized = true;
-    setState(() {});
   }
 
   @override
@@ -63,27 +52,32 @@ class _ConnectedMemoryBodyState extends State<ConnectedMemoryBody>
 
   @override
   Widget build(BuildContext context) {
-    if (!_initialized) {
-      return const Center(
-        child: CircularProgressIndicator(),
-      );
-    }
-
-    return Column(
-      key: MemoryChartPane.hoverKey,
-      children: [
-        MemoryControlPane(
-          controller: controller.control,
-        ),
-        const SizedBox(height: intermediateSpacing),
-        MemoryChartPane(
-          chart: controller.chart,
-          keyFocusNode: _focusNode,
-        ),
-        Expanded(
-          child: MemoryTabView(memoryController),
-        ),
-      ],
+    return FutureBuilder<void>(
+      future: memoryController.initialized,
+      builder: (context, snapshot) {
+        if (snapshot.connectionState == ConnectionState.done) {
+          return Column(
+            key: MemoryChartPane.hoverKey,
+            children: [
+              MemoryControlPane(
+                controller: controller.control,
+              ),
+              const SizedBox(height: intermediateSpacing),
+              MemoryChartPane(
+                chart: controller.chart,
+                keyFocusNode: _focusNode,
+              ),
+              Expanded(
+                child: MemoryTabView(memoryController),
+              ),
+            ],
+          );
+        } else {
+          return const Center(
+            child: CircularProgressIndicator(),
+          );
+        }
+      },
     );
   }
 }

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

@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:devtools_app/src/screens/memory/framework/memory_screen.dart';
 import 'package:devtools_app/src/screens/memory/panes/control/widgets/settings_dialog.dart';
 import 'package:devtools_app/src/shared/common_widgets.dart';
 import 'package:devtools_app/src/shared/globals.dart';
@@ -13,18 +12,10 @@ import 'package:flutter_test/flutter_test.dart';
 
 import '../../test_infra/matchers/matchers.dart';
 import '../../test_infra/scenes/memory/default.dart';
-import '../../test_infra/scenes/scene_test_extensions.dart';
 
 void main() {
   late MemoryDefaultScene scene;
 
-  Future<void> pumpMemoryScreen(WidgetTester tester) async {
-    await tester.pumpScene(scene);
-    // Delay to ensure the memory profiler has collected data.
-    await tester.pumpAndSettle(const Duration(seconds: 1));
-    expect(find.byType(MemoryBody), findsOneWidget);
-  }
-
   // Set a wide enough screen width that we do not run into overflow.
   const windowSize = Size(2225.0, 1000.0);
 
@@ -41,7 +32,7 @@ void main() {
     'settings update preferences',
     windowSize,
     (WidgetTester tester) async {
-      await pumpMemoryScreen(tester);
+      await scene.pump(tester);
 
       // Open the dialog.
       await tester.tap(find.byType(SettingsOutlinedButton));

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

@@ -12,13 +12,9 @@ import 'package:flutter_test/flutter_test.dart';
 
 import '../../../test_infra/matchers/matchers.dart';
 import '../../../test_infra/scenes/memory/default.dart';
-import '../../../test_infra/scenes/scene_test_extensions.dart';
 
 Future<void> pumpScene(WidgetTester tester, MemoryDefaultScene scene) async {
-  await tester.pumpScene(scene);
-  // Delay to ensure the memory profiler has collected data.
-  await tester.pumpAndSettle(const Duration(seconds: 1));
-  expect(find.byType(MemoryBody), findsOneWidget);
+  await scene.pump(tester);
   await tester.tap(
     find.byKey(MemoryScreenKeys.diffTab),
   );

packages/devtools_app/test/memory/framework/memory_controller_test.dart

@@ -2,15 +2,13 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:devtools_app/devtools_app.dart';
 import 'package:devtools_app/src/screens/memory/framework/memory_tabs.dart';
 import 'package:devtools_app/src/screens/memory/shared/heap/class_filter.dart';
 import 'package:devtools_test/helpers.dart';
 import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 import '../../test_infra/scenes/memory/default.dart';
-import '../../test_infra/scenes/scene_test_extensions.dart';
 
 final _filter1 = ClassFilter(
   except: 'filter1',
@@ -25,10 +23,8 @@ final _filter2 = ClassFilter(
 );
 
 Future<void> pumpScene(WidgetTester tester, MemoryDefaultScene scene) async {
-  await tester.pumpScene(scene);
-  // Delay to ensure the memory profiler has collected data.
-  await tester.pumpAndSettle(const Duration(seconds: 1));
-  expect(find.byType(MemoryBody), findsOneWidget);
+  await scene.pump(tester);
+
   await tester.tap(
     find.byKey(MemoryScreenKeys.diffTab),
   );

packages/devtools_app/test/memory/framework/memory_screen_test.dart

@@ -69,7 +69,8 @@ void main() {
     );
 
     // Delay to ensure the memory profiler has collected data.
-    await tester.pumpAndSettle(const Duration(seconds: 1));
+    await tester
+        .runAsync(() async => tester.pumpAndSettle(const Duration(seconds: 1)));
     expect(find.byType(MemoryBody), findsOneWidget);
   }
 
@@ -101,15 +102,6 @@ void main() {
         expect(find.text('GC'), findsOneWidget);
 
         expect(find.byType(MemoryVMChart), findsOneWidget);
-
-        expect(
-          controller.chart.memoryTimeline.liveData.isEmpty,
-          isTrue,
-        );
-        expect(
-          controller.chart.memoryTimeline.offlineData.isEmpty,
-          isTrue,
-        );
       },
     );
   });

packages/devtools_app/test/memory/profile/allocation_profile_table_view_test.dart

@@ -2,7 +2,6 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-import 'package:devtools_app/src/screens/memory/framework/memory_screen.dart';
 import 'package:devtools_app/src/screens/memory/framework/memory_tabs.dart';
 import 'package:devtools_app/src/screens/memory/panes/profile/model.dart';
 import 'package:devtools_app/src/screens/memory/panes/profile/profile_pane_controller.dart';
@@ -17,7 +16,6 @@ import 'package:flutter/material.dart';
 import 'package:flutter_test/flutter_test.dart';
 
 import '../../test_infra/scenes/memory/default.dart';
-import '../../test_infra/scenes/scene_test_extensions.dart';
 
 void main() {
   late MemoryDefaultScene scene;
@@ -27,13 +25,6 @@ void main() {
     await scene.setUp();
   });
 
-  Future<void> pumpMemoryScreen(WidgetTester tester) async {
-    await tester.pumpScene(scene);
-    // Delay to ensure the memory profiler has collected data.
-    await tester.pumpAndSettle(const Duration(seconds: 1));
-    expect(find.byType(MemoryBody), findsOneWidget);
-  }
-
   // Set a wide enough screen width that we do not run into overflow.
   const windowSize = Size(2225.0, 1200.0);
   //setGlobal(NotificationService, NotificationService());
@@ -57,7 +48,7 @@ void main() {
       'respects VM Developer Mode setting',
       windowSize,
       (WidgetTester tester) async {
-        await pumpMemoryScreen(tester);
+        await scene.pump(tester);
 
         final allocationProfileController = scene.controller.profile;
 
@@ -156,7 +147,7 @@ void main() {
       'manually refreshes',
       windowSize,
       (WidgetTester tester) async {
-        await pumpMemoryScreen(tester);
+        await scene.pump(tester);
 
         final allocationProfileController = scene.controller.profile;
         await navigateToAllocationProfile(tester, allocationProfileController);
@@ -185,7 +176,7 @@ void main() {
       'refreshes on GC',
       windowSize,
       (WidgetTester tester) async {
-        await pumpMemoryScreen(tester);
+        await scene.pump(tester);
 
         final allocationProfileController = scene.controller.profile;
 
@@ -227,7 +218,7 @@ void main() {
       'sorts correctly',
       windowSize,
       (WidgetTester tester) async {
-        await pumpMemoryScreen(tester);
+        await scene.pump(tester);
 
         final table = find.byType(FlatTable<ProfileRecord>);
         expect(table, findsOneWidget);

packages/devtools_app/test/memory/tracing/tracing_view_test.dart

@@ -18,7 +18,6 @@ import 'package:mockito/mockito.dart';
 import 'package:vm_service/vm_service.dart';
 
 import '../../test_infra/scenes/memory/default.dart';
-import '../../test_infra/scenes/scene_test_extensions.dart';
 import '../../test_infra/utils/test_utils.dart';
 
 // TODO(bkonyi): add tests for multi-isolate support.
@@ -59,10 +58,7 @@ void main() {
     late final CpuSamples allocationTracingProfile;
 
     Future<void> pumpScene(WidgetTester tester) async {
-      await tester.pumpScene(scene);
-      // Delay to ensure the memory profiler has collected data.
-      await tester.pumpAndSettle(const Duration(seconds: 1));
-      expect(find.byType(MemoryBody), findsOneWidget);
+      await scene.pump(tester);
       await tester.tap(
         find.byKey(MemoryScreenKeys.dartHeapAllocationTracingTab),
       );

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

@@ -21,6 +21,7 @@ import '../../../test_infra/test_data/memory.dart';
 import '../../../test_infra/test_data/memory_allocation.dart';
 import '../../test_data/memory/heap/heap_data.dart';
 import '../../test_data/memory/heap/heap_graph_fakes.dart';
+import '../scene_test_extensions.dart';
 
 // To run:
 // flutter run -t test/test_infra/scenes/memory/default.stager_app.g.dart -d macos
@@ -79,6 +80,13 @@ class MemoryDefaultScene extends Scene {
     );
   }
 
+  Future<void> pump(WidgetTester tester) async {
+    await tester.pumpSceneAsync(this);
+    // Delay to ensure the memory profiler has collected data.
+    await tester.pumpAndSettle(const Duration(seconds: 1));
+    expect(find.byType(MemoryBody), findsOneWidget);
+  }
+
   @override
 
   /// Sets up the scene.

packages/devtools_app/test/test_infra/scenes/scene_test_extensions.dart

@@ -14,4 +14,14 @@ extension StagerTestExtensions on WidgetTester {
       ),
     );
   }
+
+  Future<void> pumpSceneAsync(Scene scene) async {
+    await runAsync(() async {
+      await pumpWidget(
+        Builder(
+          builder: (BuildContext context) => scene.build(context),
+        ),
+      );
+    });
+  }
 }