| Index: compiler/javatests/com/google/dart/compiler/type/TypeAnalyzerTestCase.java
 | 
| diff --git a/compiler/javatests/com/google/dart/compiler/type/TypeAnalyzerTestCase.java b/compiler/javatests/com/google/dart/compiler/type/TypeAnalyzerTestCase.java
 | 
| index 0c4a5001d1f6ba0eb7911734e3d969b7dcd28459..3e3b91bfb03e12028d7f6eb60a8a4c22cd1738a5 100644
 | 
| --- a/compiler/javatests/com/google/dart/compiler/type/TypeAnalyzerTestCase.java
 | 
| +++ b/compiler/javatests/com/google/dart/compiler/type/TypeAnalyzerTestCase.java
 | 
| @@ -6,6 +6,7 @@ package com.google.dart.compiler.type;
 | 
|  
 | 
|  import com.google.common.base.Joiner;
 | 
|  import com.google.common.collect.Maps;
 | 
| +import com.google.common.collect.Sets;
 | 
|  import com.google.common.io.CharStreams;
 | 
|  import com.google.dart.compiler.ErrorCode;
 | 
|  import com.google.dart.compiler.ast.DartClass;
 | 
| @@ -20,7 +21,6 @@ import com.google.dart.compiler.ast.DartStatement;
 | 
|  import com.google.dart.compiler.ast.DartUnit;
 | 
|  import com.google.dart.compiler.ast.LibraryUnit;
 | 
|  import com.google.dart.compiler.parser.DartParser;
 | 
| -import com.google.dart.compiler.parser.DartScannerParserContext;
 | 
|  import com.google.dart.compiler.resolver.ClassElement;
 | 
|  import com.google.dart.compiler.resolver.ClassNodeElement;
 | 
|  import com.google.dart.compiler.resolver.CoreTypeProvider;
 | 
| @@ -265,7 +265,7 @@ public abstract class TypeAnalyzerTestCase extends TypeTestCase {
 | 
|  
 | 
|    private DartParser getParser(String string) {
 | 
|      DartSourceString source = new DartSourceString("<source string>", string);
 | 
| -    return new DartParser(new DartScannerParserContext(source, string, listener));
 | 
| +    return new DartParser(source, string, false, Sets.<String>newHashSet(), listener, null);
 | 
|    }
 | 
|  
 | 
|    private String getResource(String name) {
 | 
| @@ -357,7 +357,7 @@ public abstract class TypeAnalyzerTestCase extends TypeTestCase {
 | 
|  
 | 
|    private DartUnit parseUnit(String string) {
 | 
|      DartSourceString source = new DartSourceString("<source string>", string);
 | 
| -    return getParser(string).parseUnit(source);
 | 
| +    return getParser(string).parseUnit();
 | 
|    }
 | 
|  
 | 
|    protected String returnWithType(String type, Object expression) {
 | 
| 
 |