Re-combine reload error and restart test cases (#171251)

Also add an explicit test case for reload rejection error followed by an
expression evaluation.

These cases should work as expected now that this Dart SDK change has
been rolled into Flutter
https://dart-review.googlesource.com/c/sdk/+/434522.

Closes flutter/flutter#170062

Author: nshahan

packages/flutter_tools/test/integration.shard/test_data/hot_reload_errors_common.dart

@@ -5,6 +5,7 @@
 import 'package:file/file.dart';
 import 'package:flutter_tools/src/tester/flutter_tester.dart';
 import 'package:flutter_tools/src/web/web_device.dart' show GoogleChromeDevice;
+import 'package:vm_service/vm_service.dart';
 
 import '../../src/common.dart';
 import '../test_driver.dart';
@@ -34,7 +35,7 @@ void testAll({
     });
 
     testWithoutContext(
-      'hot reload displays a formatted error message when removing a field from a const class',
+      'hot reload displays a formatted error message when removing a field from a const class, and hot restart succeeds',
       () async {
         await flutter.run(
           device:
@@ -53,16 +54,45 @@ void testAll({
             ),
           ),
         );
+        await expectLater(flutter.hotRestart(), completes);
       },
     );
 
-    testWithoutContext('hot restart succeeds when removing a field from a const class', () async {
-      await flutter.run(
-        device: chrome ? GoogleChromeDevice.kChromeDeviceId : FlutterTesterDevices.kTesterDeviceId,
-        additionalCommandArgs: additionalCommandArgs,
-      );
-      project.removeFieldFromConstClass();
-      await expectLater(flutter.hotRestart(), completes);
-    });
+    testWithoutContext(
+      'Expression evaluation succeeds after a hot reload rejection error',
+      () async {
+        await flutter.run(
+          device:
+              chrome ? GoogleChromeDevice.kChromeDeviceId : FlutterTesterDevices.kTesterDeviceId,
+          withDebugger: true,
+          additionalCommandArgs: additionalCommandArgs,
+        );
+        project.removeFieldFromConstClass();
+        await expectLater(
+          flutter.hotReload(),
+          throwsA(
+            isA<Exception>().having(
+              (Exception e) => e.toString(),
+              'message',
+              contains('Try performing a hot restart instead.'),
+            ),
+          ),
+        );
+        final LibraryRef library = (await flutter.getFlutterIsolate()).libraries!.firstWhere(
+          (LibraryRef l) => l.uri!.contains('package:test/main.dart'),
+        );
+        final ObjRef result = await flutter.evaluate(library.id!, '42.isEven');
+        expect(
+          result,
+          const TypeMatcher<InstanceRef>()
+              .having((InstanceRef instance) => instance.kind, 'kind', InstanceKind.kBool)
+              .having(
+                (InstanceRef instance) => instance.valueAsString,
+                'valueAsString',
+                true.toString(),
+              ),
+        );
+      },
+    );
   });
 }