From dd52b7c5cb013e97469a1186b5d07e0bf821e6dd Mon Sep 17 00:00:00 2001
From: John McCutchan <john@johnmccutchan.com>
Date: Thu, 20 Oct 2016 09:40:00 -0700
Subject: [PATCH] Use Chain.capture instead of RunZoned (#6420)

---
 packages/flutter_tools/lib/src/hot.dart | 3 ++-
 packages/flutter_tools/lib/src/run.dart | 4 +++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/packages/flutter_tools/lib/src/hot.dart b/packages/flutter_tools/lib/src/hot.dart
index 3c0a41e0e58..240dafd2b2c 100644
--- a/packages/flutter_tools/lib/src/hot.dart
+++ b/packages/flutter_tools/lib/src/hot.dart
@@ -7,6 +7,7 @@ import 'dart:convert';
 import 'dart:io';
 
 import 'package:path/path.dart' as path;
+import 'package:stack_trace/stack_trace.dart';
 
 import 'application_package.dart';
 import 'asset.dart';
@@ -145,7 +146,7 @@ class HotRunner extends ResidentRunner {
     bool shouldBuild: true
   }) {
     // Don't let uncaught errors kill the process.
-    return runZoned(() {
+    return Chain.capture(() {
       return _run(
         connectionInfoCompleter: connectionInfoCompleter,
         route: route,
diff --git a/packages/flutter_tools/lib/src/run.dart b/packages/flutter_tools/lib/src/run.dart
index 6424651355b..dbae42e9844 100644
--- a/packages/flutter_tools/lib/src/run.dart
+++ b/packages/flutter_tools/lib/src/run.dart
@@ -5,6 +5,8 @@
 import 'dart:async';
 import 'dart:io';
 
+import 'package:stack_trace/stack_trace.dart';
+
 import 'application_package.dart';
 import 'base/logger.dart';
 import 'base/utils.dart';
@@ -47,7 +49,7 @@ class RunAndStayResident extends ResidentRunner {
     bool shouldBuild: true
   }) {
     // Don't let uncaught errors kill the process.
-    return runZoned(() {
+    return Chain.capture(() {
       assert(shouldBuild == !prebuiltMode);
       return _run(
         traceStartup: traceStartup,