Unifying compiler context

pkg/front_end/test/kernel_generator_test.dart

 // Copyright (c) 2017, the Dart project authors.  Please see the AUTHORS file
 // for details. All rights reserved. Use of this source code is governed by a
 // BSD-style license that can be found in the LICENSE file.
 
 import 'package:front_end/front_end.dart';
 import 'package:front_end/src/fasta/kernel/utils.dart';
+import 'package:front_end/src/fasta/deprecated_problems.dart'
+    show deprecated_InputError;
 import 'package:front_end/src/testing/compiler_common.dart';
 import 'package:kernel/ast.dart';
 
 import 'package:test/test.dart';
 
 main() {
   group('kernelForProgram', () {
     test('compiler fails if it cannot find sdk sources', () async {
       var errors = [];
       var options = new CompilerOptions()
@@ skipping 37 matching lines @@
 
     test('compiler requires a main method', () async {
       var errors = [];
       var options = new CompilerOptions()..onError = (e) => errors.add(e);
       await compileScript('a() => print("hi");', options: options);
       // TODO(sigmund): when we expose codes in the public APIs, we should
       // compare the code here and not the message.
       expect(errors.first.message, contains("No 'main' method found"));
     });
 
-    test('default error handler throws', () async {
+    test('default error handler throws on errors', () async {
+      var options = new CompilerOptions();
       var exceptionThrown = false;
       try {
-        await compileScript('a() => print("hi");');
-      } on CompilationError catch (e) {
+        await compileScript('a() => print("hi");', options: options);
+      } on deprecated_InputError catch (e) {
         exceptionThrown = true;
-        expect(e.message, contains("No 'main' method found"));
+        expect('${e.error}', contains("Compilation aborted"));
       }
       expect(exceptionThrown, isTrue);
     });
 
     test('generated program contains source-info', () async {
       var program = await compileScript('a() => print("hi"); main() {}',
           fileName: 'a.dart');
       // Kernel always store an empty '' key in the map, so there is always at
       // least one. Having more means that source-info is added.
       expect(program.uriToSource.keys.length, greaterThan(1));
@@ skipping 122 matching lines @@
       checkDCallsC(unitD1);
 
       var unitD2 = await compileUnit(['d.dart'], sources,
           inputSummaries: ['bc.dill', 'a.dill']);
       checkDCallsC(unitD2);
     });
 
     // TODO(sigmund): add tests with trimming dependencies
   });
 }