Repeats and fixes the changes landed & reverted as CL 1789553003.

tests/compiler/dart2js/parser_helper.dart

-// Copyright (c) 2012, the Dart project authors.  Please see the AUTHORS file
+// Copyright (c) 2016, 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.
 
 library parser_helper;
 
 import "package:expect/expect.dart";
 
 import "package:compiler/src/elements/elements.dart";
 import "package:compiler/src/tree/tree.dart";
 import "package:compiler/src/parser/element_listener.dart";
 import "package:compiler/src/parser/node_listener.dart";
 import "package:compiler/src/parser/parser.dart";
 import "package:compiler/src/parser/partial_parser.dart";
 import "package:compiler/src/scanner/string_scanner.dart";
 import "package:compiler/src/tokens/token.dart";
 import "package:compiler/src/tokens/token_constants.dart";
 import "package:compiler/src/io/source_file.dart";
 import "package:compiler/src/util/util.dart";
 
 import "package:compiler/src/elements/modelx.dart"
     show CompilationUnitElementX, ElementX, LibraryElementX;
 
 import "package:compiler/src/compiler.dart";
+import 'package:compiler/src/options.dart';
 import "package:compiler/src/diagnostics/source_span.dart";
 import "package:compiler/src/diagnostics/spannable.dart";
 import "package:compiler/src/diagnostics/diagnostic_listener.dart";
 import "package:compiler/src/diagnostics/messages.dart";
 import "package:compiler/src/script.dart";
 
+import "options_helper.dart";
+
 export "package:compiler/src/diagnostics/diagnostic_listener.dart";
 export 'package:compiler/src/parser/listener.dart';
 export 'package:compiler/src/parser/node_listener.dart';
 export 'package:compiler/src/parser/parser.dart';
 export 'package:compiler/src/parser/partial_parser.dart';
 export 'package:compiler/src/parser/partial_elements.dart';
 export "package:compiler/src/tokens/token.dart";
 export "package:compiler/src/tokens/token_constants.dart";
 
 class LoggerCanceler extends DiagnosticReporter {
+  DiagnosticOptions get options => const MockDiagnosticOptions();
+
   void log(message) {
     print(message);
   }
 
   void internalError(node, String message) {
     log(message);
   }
 
   SourceSpan spanFromSpannable(node) {
     throw 'unsupported operation';
@@ skipping 44 matching lines @@
 Node parseBodyCode(String text, Function parseMethod,
                    {DiagnosticReporter reporter}) {
   Token tokens = scan(text);
   if (reporter == null) reporter = new LoggerCanceler();
   Uri uri = new Uri(scheme: "source");
   Script script = new Script(uri, uri,new MockFile(text));
   LibraryElement library = new LibraryElementX(script);
   NodeListener listener = new NodeListener(
       new ScannerOptions(canUseNative: true),
       reporter, library.entryCompilationUnit);
-  Parser parser = new Parser(listener, enableConditionalDirectives: true);
+  Parser parser = new Parser(listener, new MockParserOptions());
   Token endToken = parseMethod(parser, tokens);
   assert(endToken.kind == EOF_TOKEN);
   Node node = listener.popNode();
   Expect.isNotNull(node);
   Expect.isTrue(listener.nodes.isEmpty, 'Not empty: ${listener.nodes}');
   return node;
 }
 
 Node parseStatement(String text) =>
   parseBodyCode(text, (parser, tokens) => parser.parseStatement(tokens));
@@ skipping 27 matching lines @@
   if (registerSource != null) {
     registerSource(uri, text);
   }
   var script = new Script(uri, uri, new MockFile(text));
   var unit = new CompilationUnitElementX(script, library);
   int id = 0;
   DiagnosticReporter reporter = compiler.reporter;
   ElementListener listener = new ElementListener(
       compiler.parsing.getScannerOptionsFor(library),
       reporter, unit, () => id++);
-  PartialParser parser = new PartialParser(listener);
+  PartialParser parser = new PartialParser(listener, new MockParserOptions());
   reporter.withCurrentElement(unit, () => parser.parseUnit(tokens));
   return unit.localMembers;
 }
 
 NodeList fullParseUnit(String source, {DiagnosticReporter reporter}) {
   return parseBodyCode(
       source,
       (parser, tokens) => parser.parseUnit(tokens),
       reporter: reporter);
 }