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

tests/compiler/dart2js/backend_dart/dart_printer_test.dart

 // Copyright (c) 2014, 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 dart_printer_test;
 
 import 'dart:mirrors';
 import 'package:expect/expect.dart';
 import 'package:compiler/src/constants/values.dart';
 import 'package:compiler/src/dart_backend/backend_ast_nodes.dart';
 import 'package:compiler/src/dart_backend/backend_ast_to_frontend_ast.dart'
     show TreePrinter;
 import 'package:compiler/src/diagnostics/diagnostic_listener.dart';
 import 'package:compiler/src/diagnostics/messages.dart';
 import 'package:compiler/src/diagnostics/spannable.dart' show Spannable;
 import 'package:compiler/src/parser/listener.dart';
 import 'package:compiler/src/parser/parser.dart';
 import 'package:compiler/src/scanner/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/string_validator.dart';
 import 'package:compiler/src/tree/tree.dart' show DartString;
 import 'package:compiler/src/tree/tree.dart' as tree;
+import '../options_helper.dart';
 
 /// For debugging the [AstBuilder] stack. Prints information about [x].
 void show(x) {
   StringBuffer buf = new StringBuffer();
   Unparser unparser = new Unparser(buf);
   void unparse(x) {
     if (x is Expression)
       unparser.writeExpression(x);
     else if (x is TypeAnnotation)
       unparser.writeType(x);
@@ skipping 631 matching lines @@
       throw new Error();
     }
   }
 }
 
 Expression parseExpression(String code) {
   SourceFile file = new StringSourceFile.fromName('', code);
   Scanner scan = new Scanner(file);
   Token tok = scan.tokenize();
   AstBuilder builder = new AstBuilder();
-  Parser parser = new Parser(builder);
+  Parser parser = new Parser(builder, new MockParserOptions());
   tok = parser.parseExpression(tok);
   if (builder.stack.length != 1 || tok.kind != EOF_TOKEN) {
     throw "Parse error in $code";
   }
   return builder.pop();
 }
 Statement parseStatement(String code) {
   SourceFile file = new StringSourceFile.fromName('', code);
   Scanner scan = new Scanner(file);
   Token tok = scan.tokenize();
   AstBuilder builder = new AstBuilder();
-  Parser parser = new Parser(builder);
+  Parser parser = new Parser(builder, new MockParserOptions());
   tok = parser.parseStatement(tok);
   if (builder.stack.length != 1 || tok.kind != EOF_TOKEN) {
     throw "Parse error in $code";
   }
   return builder.pop();
 }
 
 String unparseExpression(Expression exp) {
   StringBuffer buf = new StringBuffer();
   new Unparser(buf).writeExpression(exp);
@@ skipping 280 matching lines @@
   checkStatement("do while(x); while (y);");
   checkStatement("{do; while(x); while (y);}");
 
   checkStatement('switch(x) { case 1: case 2: return y; }');
   checkStatement('switch(x) { default: return y; }');
   checkStatement('switch(x) { case 1: x=y; default: return y; }');
   checkStatement('switch(x) { case 1: x=y; y=z; break; default: return y; }');
 
 }