Revert "[flutter_tools] remove flutter view cache (#56223)" (#56385)

This reverts commit 209bdcb6.

packages/flutter_tools/lib/src/build_runner/resident_web_runner.dart

@@ -190,11 +190,6 @@ abstract class ResidentWebRunner extends ResidentRunner {
     globals.printStatus('For a more detailed help message, press "h". $quitMessage');
   }
 
-  @override
-  Future<List<FlutterView>> listFlutterViews() async {
-    return <FlutterView>[];
-  }
-
   @override
   Future<void> debugDumpApp() async {
     try {

packages/flutter_tools/lib/src/run_cold.dart

@@ -95,6 +95,7 @@ class ColdRunner extends ResidentRunner {
         continue;
       }
       await device.initLogReader();
+      await device.refreshViews();
       globals.printTrace('Connected to ${device.device.name}');
     }
 
@@ -144,9 +145,9 @@ class ColdRunner extends ResidentRunner {
     for (final FlutterDevice device in flutterDevices) {
       await device.initLogReader();
     }
+    await refreshViews();
     for (final FlutterDevice device in flutterDevices) {
-      final List<FlutterView> views = await device.vmService.getFlutterViews();
-      for (final FlutterView view in views) {
+      for (final FlutterView view in device.views) {
         globals.printTrace('Connected to $view.');
       }
     }

packages/flutter_tools/lib/src/run_hot.dart

@@ -198,8 +198,7 @@ class HotRunner extends ResidentRunner {
     }
 
     for (final FlutterDevice device in flutterDevices) {
-      final List<FlutterView> views = await device.vmService.getFlutterViews();
-      for (final FlutterView view in views) {
+      for (final FlutterView view in device.views) {
         await device.vmService.flutterFastReassemble(
           classId,
           isolateId: view.uiIsolate.id,
@@ -278,14 +277,14 @@ class HotRunner extends ResidentRunner {
       return 3;
     }
 
+    await refreshViews();
     for (final FlutterDevice device in flutterDevices) {
       // VM must have accepted the kernel binary, there will be no reload
       // report, so we let incremental compiler know that source code was accepted.
       if (device.generator != null) {
         device.generator.accept();
       }
-      final List<FlutterView> views = await device.vmService.getFlutterViews();
-      for (final FlutterView view in views) {
+      for (final FlutterView view in device.views) {
         globals.printTrace('Connected to $view.');
       }
     }
@@ -475,15 +474,15 @@ class HotRunner extends ResidentRunner {
     Uri main,
     Uri assetsDirectory,
   ) async {
-    final List<FlutterView> views = await device.vmService.getFlutterViews();
     await Future.wait(<Future<void>>[
-      for (final FlutterView view in views)
+      for (final FlutterView view in device.views)
         device.vmService.runInView(
           viewId: view.id,
           main: main,
           assetsDirectory: assetsDirectory,
         ),
     ]);
+    await device.refreshViews();
   }
 
   Future<void> _launchFromDevFS(String mainScript) async {
@@ -502,8 +501,7 @@ class HotRunner extends ResidentRunner {
     if (benchmarkMode) {
       futures.clear();
       for (final FlutterDevice device in flutterDevices) {
-        final List<FlutterView> views = await device.vmService.getFlutterViews();
-        for (final FlutterView view in views) {
+        for (final FlutterView view in device.views) {
           futures.add(device.vmService
             .flushUIThreadTasks(uiIsolateId: view.uiIsolate.id));
         }
@@ -516,6 +514,9 @@ class HotRunner extends ResidentRunner {
     String reason,
     bool benchmarkMode = false,
   }) async {
+    globals.printTrace('Refreshing active FlutterViews before restarting.');
+    await refreshViews();
+
     final Stopwatch restartTimer = Stopwatch()..start();
     // TODO(aam): Add generator reset logic once we switch to using incremental
     // compiler for full application recompilation on restart.
@@ -540,8 +541,7 @@ class HotRunner extends ResidentRunner {
     final List<Future<void>> operations = <Future<void>>[];
     for (final FlutterDevice device in flutterDevices) {
       final Set<String> uiIsolatesIds = <String>{};
-      final List<FlutterView> views = await device.vmService.getFlutterViews();
-      for (final FlutterView view in views) {
+      for (final FlutterView view in device.views) {
         if (view.uiIsolate == null) {
           continue;
         }
@@ -810,8 +810,7 @@ class HotRunner extends ResidentRunner {
     void Function(String message) onSlow,
   }) async {
     for (final FlutterDevice device in flutterDevices) {
-      final List<FlutterView> views = await device.vmService.getFlutterViews();
-      for (final FlutterView view in views) {
+      for (final FlutterView view in device.views) {
         if (view.uiIsolate == null) {
           return OperationResult(2, 'Application isolate not found', fatal: true);
         }
@@ -819,6 +818,10 @@ class HotRunner extends ResidentRunner {
     }
 
     final Stopwatch reloadTimer = Stopwatch()..start();
+
+    globals.printTrace('Refreshing active FlutterViews before reloading.');
+    await refreshViews();
+
     final Stopwatch devFSTimer = Stopwatch()..start();
     final UpdateFSReport updatedDevFS = await _updateDevFS();
     // Record time it took to synchronize to DevFS.
@@ -909,6 +912,14 @@ class HotRunner extends ResidentRunner {
     // Record time it took for the VM to reload the sources.
     _addBenchmarkData('hotReloadVMReloadMilliseconds', vmReloadTimer.elapsed.inMilliseconds);
     final Stopwatch reassembleTimer = Stopwatch()..start();
+
+    // Reload the isolate data.
+    await Future.wait(<Future<void>>[
+      for (final FlutterDevice device in flutterDevices)
+        device.refreshViews()
+    ]);
+
+    globals.printTrace('Evicting dirty assets');
     await _evictDirtyAssets();
 
     // Check if any isolates are paused and reassemble those
@@ -919,8 +930,7 @@ class HotRunner extends ResidentRunner {
     int pausedIsolatesFound = 0;
     bool failedReassemble = false;
     for (final FlutterDevice device in flutterDevices) {
-      final List<FlutterView> views = await device.vmService.getFlutterViews();
-      for (final FlutterView view in views) {
+      for (final FlutterView view in device.views) {
         // Check if the isolate is paused, and if so, don't reassemble. Ignore the
         // PostPauseEvent event - the client requesting the pause will resume the app.
         final vm_service.Isolate isolate = await device.vmService
@@ -1045,7 +1055,11 @@ class HotRunner extends ResidentRunner {
     final StringBuffer message = StringBuffer();
     bool plural;
     if (pausedIsolatesFound == 1) {
-      message.write('The application is ');
+      if (flutterDevices.length == 1 && flutterDevices.single.views.length == 1) {
+        message.write('The application is ');
+      } else {
+        message.write('An isolate is ');
+      }
       plural = false;
     } else {
       message.write('$pausedIsolatesFound isolates are ');
@@ -1107,14 +1121,13 @@ class HotRunner extends ResidentRunner {
     }
   }
 
-  Future<void> _evictDirtyAssets() async {
+  Future<void> _evictDirtyAssets() {
     final List<Future<Map<String, dynamic>>> futures = <Future<Map<String, dynamic>>>[];
     for (final FlutterDevice device in flutterDevices) {
       if (device.devFS.assetPathsToEvict.isEmpty) {
         continue;
       }
-      final List<FlutterView> views = await device.vmService.getFlutterViews();
-      if (views.first.uiIsolate == null) {
+      if (device.views.first.uiIsolate == null) {
         globals.printError('Application isolate not found for $device');
         continue;
       }
@@ -1123,7 +1136,7 @@ class HotRunner extends ResidentRunner {
           device.vmService
             .flutterEvictAsset(
               assetPath,
-              isolateId: views.first.uiIsolate.id,
+              isolateId: device.views.first.uiIsolate.id,
             )
         );
       }

packages/flutter_tools/lib/src/vmservice.dart

@@ -684,29 +684,15 @@ extension FlutterVmService on vm_service.VmService {
   }
 
   /// List all [FlutterView]s attached to the current VM.
-  ///
-  /// If this returns an empty list, it will poll forever unless [returnEarly]
-  /// is set to true.
-  ///
-  /// By default, the poll duration is 50 milliseconds.
-  Future<List<FlutterView>> getFlutterViews({
-    bool returnEarly = false,
-    Duration delay = const Duration(milliseconds: 50),
-  }) async {
-    while (true) {
-      final vm_service.Response response = await callMethod(
-        kListViewsMethod,
-      );
-      final List<Object> rawViews = response.json['views'] as List<Object>;
-      final List<FlutterView> views = <FlutterView>[
-        for (final Object rawView in rawViews)
-          FlutterView.parse(rawView as Map<String, Object>)
-      ];
-      if (views.isNotEmpty || returnEarly) {
-        return views;
-      }
-      await Future<void>.delayed(delay);
-    }
+  Future<List<FlutterView>> getFlutterViews() async {
+    final vm_service.Response response = await callMethod(
+      kListViewsMethod,
+    );
+    final List<Object> rawViews = response.json['views'] as List<Object>;
+    return <FlutterView>[
+      for (final Object rawView in rawViews)
+        FlutterView.parse(rawView as Map<String, Object>)
+    ];
   }
 
   /// Attempt to retrieve the isolate with id [isolateId], or `null` if it has

packages/flutter_tools/lib/src/web/web_device.dart

@@ -66,7 +66,7 @@ abstract class ChromiumDevice extends Device {
   bool get supportsStartPaused => true;
 
   @override
-  bool get supportsFlutterExit => false;
+  bool get supportsFlutterExit => true;
 
   @override
   bool get supportsScreenshot => false;
@@ -343,9 +343,6 @@ class WebServerDevice extends Device {
   @override
   Future<bool> isLatestBuildInstalled(ApplicationPackage app) async => true;
 
-  @override
-  bool get supportsFlutterExit => false;
-
   @override
   Future<bool> get isLocalEmulator async => false;
 

packages/flutter_tools/test/commands.shard/hermetic/attach_test.dart

@@ -685,6 +685,7 @@ VMServiceConnector getFakeVmServiceFactory({
     final FakeVmServiceHost fakeVmServiceHost = FakeVmServiceHost(
       requests: <VmServiceExpectation>[
         FakeVmServiceRequest(
+          id: '1',
           method: kListViewsMethod,
           args: null,
           jsonResponse: <String, Object>{
@@ -697,12 +698,14 @@ VMServiceConnector getFakeVmServiceFactory({
           },
         ),
         FakeVmServiceRequest(
+          id: '2',
           method: 'getVM',
           args: null,
           jsonResponse: vm_service.VM.parse(<String, Object>{})
             .toJson(),
         ),
         FakeVmServiceRequest(
+          id: '3',
           method: '_createDevFS',
           args: <String, Object>{
             'fsName': globals.fs.currentDirectory.absolute.path,
@@ -712,6 +715,7 @@ VMServiceConnector getFakeVmServiceFactory({
           },
         ),
         FakeVmServiceRequest(
+          id: '4',
           method: kListViewsMethod,
           args: null,
           jsonResponse: <String, Object>{

packages/flutter_tools/test/commands.shard/permeable/devices_test.dart

@@ -65,7 +65,7 @@ void main() {
             'hotRestart': true,
             'screenshot': false,
             'fastStart': false,
-            'flutterExit': false,
+            'flutterExit': true,
             'hardwareRendering': false,
             'startPaused': true
           }

packages/flutter_tools/test/general.shard/coverage_collector_test.dart

@@ -12,6 +12,7 @@ void main() {
     final FakeVmServiceHost fakeVmServiceHost = FakeVmServiceHost(
       requests: <VmServiceExpectation>[
         FakeVmServiceRequest(
+          id: '1',
           method: 'getVM',
           jsonResponse: (vm_service.VM.parse(<String, Object>{})
             ..isolates = <vm_service.IsolateRef>[
@@ -22,6 +23,7 @@ void main() {
           ).toJson(),
         ),
         const FakeVmServiceRequest(
+          id: '2',
           method: 'getScripts',
           args: <String, Object>{
             'isolateId': '1',

packages/flutter_tools/test/general.shard/devfs_test.dart

@@ -129,6 +129,7 @@ void main() {
         final FakeVmServiceHost fakeVmServiceHost = FakeVmServiceHost(
           requests: <VmServiceExpectation>[
             FakeVmServiceRequest(
+              id: '1',
               method: '_createDevFS',
               args: <String, Object>{
                 'fsName': 'test',
@@ -201,6 +202,7 @@ void main() {
       final FakeVmServiceHost fakeVmServiceHost = FakeVmServiceHost(
         requests: <VmServiceExpectation>[
           FakeVmServiceRequest(
+            id: '1',
             method: '_createDevFS',
             args: <String, Object>{
               'fsName': 'test',

packages/flutter_tools/test/general.shard/fuchsia/fuchsia_device_test.dart

@@ -637,6 +637,7 @@ void main() {
       final FakeVmServiceHost fakeVmServiceHost = FakeVmServiceHost(
         requests: <VmServiceExpectation>[
           FakeVmServiceRequest(
+            id: '1',
             method: kListViewsMethod,
             jsonResponse: <String, Object>{
               'views': <Object>[

packages/flutter_tools/test/general.shard/hot_test.dart

@@ -21,36 +21,6 @@ import '../src/common.dart';
 import '../src/context.dart';
 import '../src/mocks.dart';
 
-final vm_service.Isolate fakeUnpausedIsolate = vm_service.Isolate(
-  id: '1',
-  pauseEvent: vm_service.Event(
-    kind: vm_service.EventKind.kResume,
-    timestamp: 0
-  ),
-  breakpoints: <vm_service.Breakpoint>[],
-  exceptionPauseMode: null,
-  libraries: <vm_service.LibraryRef>[],
-  livePorts: 0,
-  name: 'test',
-  number: '1',
-  pauseOnExit: false,
-  runnable: true,
-  startTime: 0,
-);
-
-final FlutterView fakeFlutterView = FlutterView(
-  id: 'a',
-  uiIsolate: fakeUnpausedIsolate,
-);
-
-final FakeVmServiceRequest listViews = FakeVmServiceRequest(
-  method: kListViewsMethod,
-  jsonResponse: <String, Object>{
-    'views': <Object>[
-      fakeFlutterView.toJson(),
-    ],
-  },
-);
 void main() {
   group('validateReloadReport', () {
     testUsingContext('invalid', () async {
@@ -202,72 +172,42 @@ void main() {
 
     testUsingContext('Does hot restarts when all devices support it', () async {
       final FakeVmServiceHost fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[
-        listViews,
-        FakeVmServiceRequest(
-          method: 'getIsolate',
-          args: <String, Object>{
-            'isolateId': fakeUnpausedIsolate.id,
-          },
-          jsonResponse: fakeUnpausedIsolate.toJson(),
+        const FakeVmServiceRequest(
+          id: '1',
+          method: kListViewsMethod,
+          jsonResponse: <String, Object>{
+            'views': <Object>[],
+          }
+        ),
+         const FakeVmServiceRequest(
+          id: '2',
+          method: kListViewsMethod,
+          jsonResponse: <String, Object>{
+            'views': <Object>[],
+          }
         ),
         FakeVmServiceRequest(
+          id: '3',
           method: 'getVM',
           jsonResponse: vm_service.VM.parse(<String, Object>{}).toJson()
         ),
-        listViews,
-        FakeVmServiceRequest(
-          method: 'getIsolate',
-          args: <String, Object>{
-            'isolateId': fakeUnpausedIsolate.id,
-          },
-          jsonResponse: fakeUnpausedIsolate.toJson(),
-        ),
         FakeVmServiceRequest(
+          id: '4',
           method: 'getVM',
           jsonResponse: vm_service.VM.parse(<String, Object>{}).toJson()
         ),
-        listViews,
-        listViews,
         const FakeVmServiceRequest(
-          method: 'streamListen',
-          args: <String, Object>{
-            'streamId': 'Isolate',
+          id: '5',
+          method: kListViewsMethod,
+          jsonResponse: <String, Object>{
+            'views': <Object>[],
           }
         ),
         const FakeVmServiceRequest(
-          method: 'streamListen',
-          args: <String, Object>{
-            'streamId': 'Isolate',
-          }
-        ),
-        FakeVmServiceStreamResponse(
-          streamId: 'Isolate',
-          event: vm_service.Event(
-            timestamp: 0,
-            kind: vm_service.EventKind.kIsolateRunnable,
-          )
-        ),
-        FakeVmServiceStreamResponse(
-          streamId: 'Isolate',
-          event: vm_service.Event(
-            timestamp: 0,
-            kind: vm_service.EventKind.kIsolateRunnable,
-          )
-        ),
-        FakeVmServiceRequest(
-          method: kRunInViewMethod,
-          args: <String, Object>{
-            'viewId': fakeFlutterView.id,
-            'mainScript': 'lib/main.dart.dill',
-            'assetDirectory': 'build/flutter_assets',
-          }
-        ),
-        FakeVmServiceRequest(
-          method: kRunInViewMethod,
-          args: <String, Object>{
-            'viewId': fakeFlutterView.id,
-            'mainScript': 'lib/main.dart.dill',
-            'assetDirectory': 'build/flutter_assets',
+          id: '6',
+          method: kListViewsMethod,
+          jsonResponse: <String, Object>{
+            'views': <Object>[],
           }
         ),
       ]);
@@ -317,40 +257,25 @@ void main() {
     testUsingContext('hot restart supported', () async {
       // Setup mocks
       final FakeVmServiceHost fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[
-        listViews,
-        FakeVmServiceRequest(
-          method: 'getIsolate',
-          args: <String, Object>{
-            'isolateId': fakeUnpausedIsolate.id,
-          },
-          jsonResponse: fakeUnpausedIsolate.toJson(),
+        const FakeVmServiceRequest(
+          id: '1',
+          method: kListViewsMethod,
+          jsonResponse: <String, Object>{
+            'views': <Object>[],
+          }
         ),
         FakeVmServiceRequest(
+          id: '2',
           method: 'getVM',
-          jsonResponse: vm_service.VM.parse(<String, Object>{}).toJson(),
+          jsonResponse: vm_service.VM.parse(<String, Object>{}).toJson()
         ),
-        listViews,
         const FakeVmServiceRequest(
-          method: 'streamListen',
-          args: <String, Object>{
-            'streamId': 'Isolate',
-          }
-        ),
-        FakeVmServiceRequest(
-          method: kRunInViewMethod,
-          args: <String, Object>{
-            'viewId': fakeFlutterView.id,
-            'mainScript': 'lib/main.dart.dill',
-            'assetDirectory': 'build/flutter_assets',
+          id: '3',
+          method: kListViewsMethod,
+          jsonResponse: <String, Object>{
+            'views': <Object>[],
           }
         ),
-        FakeVmServiceStreamResponse(
-          streamId: 'Isolate',
-          event: vm_service.Event(
-            timestamp: 0,
-            kind: vm_service.EventKind.kIsolateRunnable,
-          )
-        ),
       ]);
       final MockDevice mockDevice = MockDevice();
       when(mockDevice.supportsHotReload).thenReturn(true);

packages/flutter_tools/test/general.shard/resident_web_runner_test.dart

@@ -36,12 +36,14 @@ import '../src/testbed.dart';
 
 const List<VmServiceExpectation> kAttachLogExpectations = <VmServiceExpectation>[
   FakeVmServiceRequest(
+    id: '1',
     method: 'streamListen',
     args: <String, Object>{
       'streamId': 'Stdout',
     },
   ),
   FakeVmServiceRequest(
+    id: '2',
     method: 'streamListen',
     args: <String, Object>{
       'streamId': 'Stderr',
@@ -51,12 +53,14 @@ const List<VmServiceExpectation> kAttachLogExpectations = <VmServiceExpectation>
 
 const List<VmServiceExpectation> kAttachIsolateExpectations = <VmServiceExpectation>[
   FakeVmServiceRequest(
+    id: '3',
     method: 'streamListen',
     args: <String, Object>{
       'streamId': 'Isolate'
     }
   ),
   FakeVmServiceRequest(
+    id: '4',
     method: 'registerService',
     args: <String, Object>{
       'service': 'reloadSources',
@@ -358,6 +362,7 @@ void main() {
       ...kAttachExpectations,
       const FakeVmServiceRequest(
         method: 'hotRestart',
+        id: '5',
         jsonResponse: <String, Object>{
           'type': 'Success',
         }
@@ -434,6 +439,7 @@ void main() {
       ...kAttachExpectations,
       const FakeVmServiceRequest(
         method: 'hotRestart',
+        id: '5',
         jsonResponse: <String, Object>{
           'type': 'Success',
         }
@@ -664,6 +670,7 @@ void main() {
     fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[
       ...kAttachExpectations,
       const FakeVmServiceRequest(
+        id: '5',
         method: 'hotRestart',
         jsonResponse: <String, Object>{
           'type': 'Failed',
@@ -686,6 +693,7 @@ void main() {
     fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[
       ...kAttachExpectations,
       const FakeVmServiceRequest(
+        id: '5',
         method: 'hotRestart',
         // Failed response,
         errorCode: RPCErrorCodes.kInternalError,
@@ -717,6 +725,7 @@ void main() {
     fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[
       ...kAttachExpectations,
       const FakeVmServiceRequest(
+        id: '5',
         method: 'ext.flutter.debugDumpApp',
         args: <String, Object>{
           'isolateId': null,
@@ -738,6 +747,7 @@ void main() {
     fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[
       ...kAttachExpectations,
       const FakeVmServiceRequest(
+        id: '5',
         method: 'ext.flutter.debugDumpLayerTree',
         args: <String, Object>{
           'isolateId': null,
@@ -759,6 +769,7 @@ void main() {
     fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[
       ...kAttachExpectations,
       const FakeVmServiceRequest(
+        id: '5',
         method: 'ext.flutter.debugDumpRenderTree',
         args: <String, Object>{
           'isolateId': null,
@@ -780,6 +791,7 @@ void main() {
     fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[
       ...kAttachExpectations,
       const FakeVmServiceRequest(
+        id: '5',
         method: 'ext.flutter.debugDumpSemanticsTreeInTraversalOrder',
         args: <String, Object>{
           'isolateId': null,
@@ -801,6 +813,7 @@ void main() {
     fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[
       ...kAttachExpectations,
       const FakeVmServiceRequest(
+        id: '5',
         method: 'ext.flutter.debugDumpSemanticsTreeInInverseHitTestOrder',
         args: <String, Object>{
           'isolateId': null,
@@ -823,6 +836,7 @@ void main() {
     fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[
       ...kAttachExpectations,
       const FakeVmServiceRequest(
+        id: '5',
         method: 'ext.flutter.debugPaint',
         args: <String, Object>{
           'isolateId': null,
@@ -832,6 +846,7 @@ void main() {
         },
       ),
       const FakeVmServiceRequest(
+        id: '6',
         method: 'ext.flutter.debugPaint',
         args: <String, Object>{
           'isolateId': null,
@@ -859,6 +874,7 @@ void main() {
     fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[
       ...kAttachExpectations,
       const FakeVmServiceRequest(
+        id: '5',
         method: 'ext.flutter.showPerformanceOverlay',
         args: <String, Object>{
           'isolateId': null,
@@ -868,6 +884,7 @@ void main() {
         },
       ),
       const FakeVmServiceRequest(
+        id: '6',
         method: 'ext.flutter.showPerformanceOverlay',
         args: <String, Object>{
           'isolateId': null,
@@ -894,6 +911,7 @@ void main() {
     fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[
       ...kAttachExpectations,
       const FakeVmServiceRequest(
+        id: '5',
         method: 'ext.flutter.inspector.show',
         args: <String, Object>{
           'isolateId': null,
@@ -903,6 +921,7 @@ void main() {
         },
       ),
       const FakeVmServiceRequest(
+        id: '6',
         method: 'ext.flutter.inspector.show',
         args: <String, Object>{
           'isolateId': null,
@@ -929,6 +948,7 @@ void main() {
     fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[
       ...kAttachExpectations,
       const FakeVmServiceRequest(
+        id: '5',
         method: 'ext.flutter.profileWidgetBuilds',
         args: <String, Object>{
           'isolateId': null,
@@ -938,6 +958,7 @@ void main() {
         },
       ),
       const FakeVmServiceRequest(
+        id: '6',
         method: 'ext.flutter.profileWidgetBuilds',
         args: <String, Object>{
           'isolateId': null,
@@ -964,6 +985,7 @@ void main() {
     fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[
       ...kAttachExpectations,
       const FakeVmServiceRequest(
+        id: '5',
         method: 'ext.flutter.platformOverride',
         args: <String, Object>{
           'isolateId': null,
@@ -973,6 +995,7 @@ void main() {
         },
       ),
       const FakeVmServiceRequest(
+        id: '6',
         method: 'ext.flutter.platformOverride',
         args: <String, Object>{
           'isolateId': null,
@@ -1066,12 +1089,14 @@ void main() {
     fakeVmServiceHost = FakeVmServiceHost(requests: <VmServiceExpectation>[
       ...kAttachLogExpectations,
       const FakeVmServiceRequest(
+        id: '3',
         method: 'streamListen',
         args: <String, Object>{
           'streamId': 'Isolate'
         }
       ),
       const FakeVmServiceRequest(
+        id: '4',
         method: 'registerService',
         args: <String, Object>{
           'service': 'reloadSources',

packages/flutter_tools/test/general.shard/terminal_handler_test.dart

@@ -139,9 +139,7 @@ void main() {
       final MockFlutterDevice mockFlutterDevice = MockFlutterDevice();
       when(mockResidentRunner.isRunningDebug).thenReturn(true);
       when(mockResidentRunner.flutterDevices).thenReturn(<FlutterDevice>[mockFlutterDevice]);
-      when(mockResidentRunner.listFlutterViews()).thenAnswer((Invocation invocation) async {
-        return <FlutterView>[];
-      });
+      when(mockFlutterDevice.views).thenReturn(<FlutterView>[]);
 
       await terminalHandler.processTerminalInput('l');
 

packages/flutter_tools/test/general.shard/vmservice_test.dart

@@ -231,10 +231,10 @@ void main() {
   testWithoutContext('runInView forwards arguments correctly', () async {
     final FakeVmServiceHost fakeVmServiceHost = FakeVmServiceHost(
       requests: <VmServiceExpectation>[
-        const FakeVmServiceRequest(method: 'streamListen', args: <String, Object>{
+        const FakeVmServiceRequest(method: 'streamListen', id: '1', args: <String, Object>{
           'streamId': 'Isolate'
         }),
-        const FakeVmServiceRequest(method: kRunInViewMethod, args: <String, Object>{
+        const FakeVmServiceRequest(method: kRunInViewMethod, id: '2', args: <String, Object>{
           'viewId': '1234',
           'mainScript': 'main.dart',
           'assetDirectory': 'flutter_assets/',
@@ -256,65 +256,6 @@ void main() {
     );
     expect(fakeVmServiceHost.hasRemainingExpectations, false);
   });
-
-  testWithoutContext('getFlutterViews polls until a view is returned', () async {
-    final FakeVmServiceHost fakeVmServiceHost = FakeVmServiceHost(
-      requests: <VmServiceExpectation>[
-        const FakeVmServiceRequest(
-          method: kListViewsMethod,
-          jsonResponse: <String, Object>{
-            'views': <Object>[],
-          },
-        ),
-        const FakeVmServiceRequest(
-          method: kListViewsMethod,
-          jsonResponse: <String, Object>{
-            'views': <Object>[],
-          },
-        ),
-        const FakeVmServiceRequest(
-          method: kListViewsMethod,
-          jsonResponse: <String, Object>{
-            'views': <Object>[
-              <String, Object>{
-                'id': 'a',
-                'isolate': <String, Object>{},
-              },
-            ],
-          },
-        ),
-      ]
-    );
-
-    expect(
-      await fakeVmServiceHost.vmService.getFlutterViews(
-        delay: Duration.zero,
-      ),
-      isNotEmpty,
-    );
-    expect(fakeVmServiceHost.hasRemainingExpectations, false);
-  });
-
-  testWithoutContext('getFlutterViews does not poll if returnEarly is true', () async {
-    final FakeVmServiceHost fakeVmServiceHost = FakeVmServiceHost(
-      requests: <VmServiceExpectation>[
-        const FakeVmServiceRequest(
-          method: kListViewsMethod,
-          jsonResponse: <String, Object>{
-            'views': <Object>[],
-          },
-        ),
-      ]
-    );
-
-    expect(
-      await fakeVmServiceHost.vmService.getFlutterViews(
-        returnEarly: true,
-      ),
-      isEmpty,
-    );
-    expect(fakeVmServiceHost.hasRemainingExpectations, false);
-  });
 }
 
 class MockDevice extends Mock implements Device {}

packages/flutter_tools/test/general.shard/web/devices_test.dart

@@ -76,7 +76,7 @@ void main() {
     expect(chromeDevice.supportsHotReload, true);
     expect(chromeDevice.supportsHotRestart, true);
     expect(chromeDevice.supportsStartPaused, true);
-    expect(chromeDevice.supportsFlutterExit, false);
+    expect(chromeDevice.supportsFlutterExit, true);
     expect(chromeDevice.supportsScreenshot, false);
     expect(await chromeDevice.isLocalEmulator, false);
     expect(chromeDevice.getLogReader(), isA<NoOpDeviceLogReader>());
@@ -96,7 +96,7 @@ void main() {
     expect(chromeDevice.supportsHotReload, true);
     expect(chromeDevice.supportsHotRestart, true);
     expect(chromeDevice.supportsStartPaused, true);
-    expect(chromeDevice.supportsFlutterExit, false);
+    expect(chromeDevice.supportsFlutterExit, true);
     expect(chromeDevice.supportsScreenshot, false);
     expect(await chromeDevice.isLocalEmulator, false);
     expect(chromeDevice.getLogReader(), isA<NoOpDeviceLogReader>());
@@ -114,7 +114,7 @@ void main() {
     expect(device.supportsHotReload, true);
     expect(device.supportsHotRestart, true);
     expect(device.supportsStartPaused, true);
-    expect(device.supportsFlutterExit, false);
+    expect(device.supportsFlutterExit, true);
     expect(device.supportsScreenshot, false);
     expect(await device.isLocalEmulator, false);
     expect(device.getLogReader(), isA<NoOpDeviceLogReader>());

packages/flutter_tools/test/src/common.dart

@@ -239,6 +239,7 @@ class FakeVmServiceHost {
       final FakeVmServiceRequest fakeRequest = _requests.removeAt(0) as FakeVmServiceRequest;
       expect(request, isA<Map<String, Object>>()
         .having((Map<String, Object> request) => request['method'], 'method', fakeRequest.method)
+        .having((Map<String, Object> request) => request['id'], 'id', fakeRequest.id)
         .having((Map<String, Object> request) => request['params'], 'args', fakeRequest.args)
       );
       if (fakeRequest.close) {
@@ -249,13 +250,13 @@ class FakeVmServiceHost {
       if (fakeRequest.errorCode == null) {
         _input.add(json.encode(<String, Object>{
           'jsonrpc': '2.0',
-          'id': request['id'],
+          'id': fakeRequest.id,
           'result': fakeRequest.jsonResponse ?? <String, Object>{'type': 'Success'},
         }));
       } else {
         _input.add(json.encode(<String, Object>{
           'jsonrpc': '2.0',
-          'id': request['id'],
+          'id': fakeRequest.id,
           'error': <String, Object>{
             'code': fakeRequest.errorCode,
           }
@@ -298,6 +299,7 @@ abstract class VmServiceExpectation {
 class FakeVmServiceRequest implements VmServiceExpectation {
   const FakeVmServiceRequest({
     @required this.method,
+    @required this.id,
     this.args = const <String, Object>{},
     this.jsonResponse,
     this.errorCode,
@@ -305,6 +307,7 @@ class FakeVmServiceRequest implements VmServiceExpectation {
   });
 
   final String method;
+  final String id;
 
   /// When true, the vm service is automatically closed.
   final bool close;