staging

lib/common/promise.ts

@@ -494,6 +494,7 @@ Zone.__load_patch('ZoneAwarePromise', (global: any, Zone: ZoneType, api: _ZonePr
       });
       return wrapped.then(onResolve, onReject);
     };
+    Ctor.prototype['__zone_symbol__patchedThen'] = Ctor.prototype.then;
     (Ctor as any)[symbolThenPatched] = true;
   }
 
@@ -522,4 +523,14 @@ Zone.__load_patch('ZoneAwarePromise', (global: any, Zone: ZoneType, api: _ZonePr
 
   // This is not part of public API, but it is useful for tests, so we expose it.
   (Promise as any)[Zone.__symbol__('uncaughtPromiseErrors')] = _uncaughtPromiseErrors;
+  return {
+    unPatchFn: function() {
+      global['__zone_symbol__ZoneAwarePromise'] = NativePromise;
+      NativePromise.prototype.then = NativePromise.prototype[symbolThen];
+    },
+    rePatchFn: function() {
+      global['__zone_symbol__ZoneAwarePromise'] = ZoneAwarePromise;
+      NativePromise.prototype.then = NativePromise.prototype['__zone_symbol__patchedThen'];
+    }
+  };
 });