| Index: tests/language/function_type/function_type68_test.dart | 
| diff --git a/tests/language/function_type/function_type68_test.dart b/tests/language/function_type/function_type68_test.dart | 
| index 72d427673c7b55a515ae348bdc8fb5e7502b9007..b1d155b267f7fa4bc21a0a920018b45dd2a46d87 100644 | 
| --- a/tests/language/function_type/function_type68_test.dart | 
| +++ b/tests/language/function_type/function_type68_test.dart | 
| @@ -19,58 +19,30 @@ import 'package:expect/expect.dart'; | 
| @AssumeDynamic() | 
| confuse(f) => f; | 
|  | 
| -final bool inCheckedMode = (() { | 
| -  bool result = false; | 
| -  assert(result = true); | 
| -  return result; | 
| -})(); | 
| - | 
| -typedef F0<T> | 
| -    = Function Function([Function x]); | 
| -typedef F1<T> | 
| -    = core.List<core.int> Function(int x); | 
| -typedef F2<T> | 
| -    = List<T> Function(List<T> x); | 
| -typedef F3<T> | 
| -    = void Function(int y, {List<Function> x}); | 
| -typedef F4<T> | 
| -    = int Function([int x]) Function(); | 
| -typedef F5<T> | 
| -    = int Function(List<Function> x0) Function(); | 
| -typedef F6<T> | 
| -    = int Function(int x, [List<T> x2]) Function(); | 
| -typedef F7<T> | 
| -    = Function Function(int x0, {Function x}) Function(); | 
| -typedef F8<T> | 
| -    = Function Function([List<T> x]) Function(); | 
| -typedef F9<T> | 
| -    = List<Function> Function(int y, [Function x]) Function(); | 
| -typedef F10<T> | 
| -    = List<Function> Function(int x1, [core.List<core.int> x2]) Function(); | 
| -typedef F11<T> | 
| -    = core.List<core.int> Function({int x}) Function(); | 
| -typedef F12<T> | 
| -    = core.List<core.int> Function(core.List<core.int> x) Function(); | 
| -typedef F13<T> | 
| -    = List<T> Function(int x0, [int x]) Function(); | 
| -typedef F14<T> | 
| -    = List<T> Function([List<Function> x1]) Function(); | 
| -typedef F15<T> | 
| -    = List<T> Function({List<T> x}) Function(); | 
| -typedef F16<T> | 
| -    = Function(int y, {Function x}) Function(); | 
| -typedef F17<T> | 
| -    = Function(int x0, [List<T> x]) Function(); | 
| -typedef F18<T> | 
| -    = void Function(Function x0) Function(); | 
| -typedef F19<T> | 
| -    = void Function(int x, [core.List<core.int> x2]) Function(); | 
| -typedef F20<T> | 
| -    = Function Function<A>(Function x) Function(); | 
| -typedef F21<T> | 
| -    = List<T> Function<A>(List<Function> x) Function(); | 
| -typedef F22<T> | 
| -    = List<A> Function<A>(core.List<core.int> x) Function(); | 
| +typedef F0<T> = Function Function([Function x]); | 
| +typedef F1<T> = core.List<core.int> Function(int x); | 
| +typedef F2<T> = List<T> Function(List<T> x); | 
| +typedef F3<T> = void Function(int y, {List<Function> x}); | 
| +typedef F4<T> = int Function([int x]) Function(); | 
| +typedef F5<T> = int Function(List<Function> x0) Function(); | 
| +typedef F6<T> = int Function(int x, [List<T> x2]) Function(); | 
| +typedef F7<T> = Function Function(int x0, {Function x}) Function(); | 
| +typedef F8<T> = Function Function([List<T> x]) Function(); | 
| +typedef F9<T> = List<Function> Function(int y, [Function x]) Function(); | 
| +typedef F10<T> = List<Function> Function(int x1, [core.List<core.int> x2]) | 
| +    Function(); | 
| +typedef F11<T> = core.List<core.int> Function({int x}) Function(); | 
| +typedef F12<T> = core.List<core.int> Function(core.List<core.int> x) Function(); | 
| +typedef F13<T> = List<T> Function(int x0, [int x]) Function(); | 
| +typedef F14<T> = List<T> Function([List<Function> x1]) Function(); | 
| +typedef F15<T> = List<T> Function({List<T> x}) Function(); | 
| +typedef F16<T> = Function(int y, {Function x}) Function(); | 
| +typedef F17<T> = Function(int x0, [List<T> x]) Function(); | 
| +typedef F18<T> = void Function(Function x0) Function(); | 
| +typedef F19<T> = void Function(int x, [core.List<core.int> x2]) Function(); | 
| +typedef F20<T> = Function Function<A>(Function x) Function(); | 
| +typedef F21<T> = List<T> Function<A>(List<Function> x) Function(); | 
| +typedef F22<T> = List<A> Function<A>(core.List<core.int> x) Function(); | 
|  | 
| Function f0([Function x]) => null; | 
| core.List<core.int> f1(int x) => null; | 
| @@ -256,7 +228,7 @@ class U68<T> { | 
| Expect.equals(tIsDynamic, m2 is F2<bool>); | 
| Expect.equals(tIsDynamic, confuse(m2) is F2<bool>); | 
| } else { | 
| -      if (inCheckedMode) { | 
| +      if (typeAssertionsEnabled) { | 
| Expect.throws(() { | 
| x2 = (f2 as dynamic); | 
| }); | 
| @@ -380,7 +352,7 @@ class U68<T> { | 
| Expect.equals(tIsDynamic, m6 is F6<bool>); | 
| Expect.equals(tIsDynamic, confuse(m6) is F6<bool>); | 
| } else { | 
| -      if (inCheckedMode) { | 
| +      if (typeAssertionsEnabled) { | 
| Expect.throws(() { | 
| x6 = (f6 as dynamic); | 
| }); | 
| @@ -456,7 +428,7 @@ class U68<T> { | 
| Expect.equals(tIsDynamic, m8 is F8<bool>); | 
| Expect.equals(tIsDynamic, confuse(m8) is F8<bool>); | 
| } else { | 
| -      if (inCheckedMode) { | 
| +      if (typeAssertionsEnabled) { | 
| Expect.throws(() { | 
| x8 = (f8 as dynamic); | 
| }); | 
| @@ -519,7 +491,8 @@ class U68<T> { | 
|  | 
| Expect.isTrue(m10 is F10); | 
| Expect.isTrue(m10 is List<Function> Function(int x1, | 
| -        [core.List<core.int> x2]) Function()); | 
| +            [core.List<core.int> x2]) | 
| +        Function()); | 
| Expect.isTrue(confuse(m10) is F10); | 
| // In checked mode, verifies the type. | 
| x10 = m10; | 
| @@ -607,7 +580,7 @@ class U68<T> { | 
| Expect.equals(tIsDynamic, m13 is F13<bool>); | 
| Expect.equals(tIsDynamic, confuse(m13) is F13<bool>); | 
| } else { | 
| -      if (inCheckedMode) { | 
| +      if (typeAssertionsEnabled) { | 
| Expect.throws(() { | 
| x13 = (f13 as dynamic); | 
| }); | 
| @@ -659,7 +632,7 @@ class U68<T> { | 
| Expect.equals(tIsDynamic, m14 is F14<bool>); | 
| Expect.equals(tIsDynamic, confuse(m14) is F14<bool>); | 
| } else { | 
| -      if (inCheckedMode) { | 
| +      if (typeAssertionsEnabled) { | 
| Expect.throws(() { | 
| x14 = (f14 as dynamic); | 
| }); | 
| @@ -711,7 +684,7 @@ class U68<T> { | 
| Expect.equals(tIsDynamic, m15 is F15<bool>); | 
| Expect.equals(tIsDynamic, confuse(m15) is F15<bool>); | 
| } else { | 
| -      if (inCheckedMode) { | 
| +      if (typeAssertionsEnabled) { | 
| Expect.throws(() { | 
| x15 = (f15 as dynamic); | 
| }); | 
| @@ -787,7 +760,7 @@ class U68<T> { | 
| Expect.equals(tIsDynamic, m17 is F17<bool>); | 
| Expect.equals(tIsDynamic, confuse(m17) is F17<bool>); | 
| } else { | 
| -      if (inCheckedMode) { | 
| +      if (typeAssertionsEnabled) { | 
| Expect.throws(() { | 
| x17 = (f17 as dynamic); | 
| }); | 
| @@ -912,7 +885,7 @@ class U68<T> { | 
| Expect.equals(tIsDynamic, m21 is F21<bool>); | 
| Expect.equals(tIsDynamic, confuse(m21) is F21<bool>); | 
| } else { | 
| -      if (inCheckedMode) { | 
| +      if (typeAssertionsEnabled) { | 
| Expect.throws(() { | 
| x21 = (f21 as dynamic); | 
| }); | 
|  |