cleanup fasta token classes

pkg/front_end/test/fasta/parser/token_stream_rewriter_test.dart

Index: pkg/front_end/test/fasta/parser/token_stream_rewriter_test.dart
diff --git a/pkg/front_end/test/fasta/parser/token_stream_rewriter_test.dart b/pkg/front_end/test/fasta/parser/token_stream_rewriter_test.dart
index eb3d6fc6fb06b5a1a1c6189d4f24ff60ab56bbff..e7d4a670ab5d9aa3454f04b7c02be96bea7c6976 100644
--- a/pkg/front_end/test/fasta/parser/token_stream_rewriter_test.dart
+++ b/pkg/front_end/test/fasta/parser/token_stream_rewriter_test.dart
@@ -4,7 +4,8 @@
 
 import 'package:front_end/src/fasta/parser/token_stream_rewriter.dart';
 import 'package:front_end/src/fasta/scanner/token.dart';
-import 'package:front_end/src/scanner/token.dart' show Token, TokenType;
+import 'package:front_end/src/scanner/token.dart'
+    show BeginToken, Token, TokenType;
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
 
@@ -104,7 +105,7 @@ abstract class TokenStreamRewriterTest {
   ///
   /// The EOF token is returned.
   Token _link(Iterable<Token> tokens) {
-    Token head = new SymbolToken.eof(-1);
+    Token head = new Token.eof(-1);
     if (!setPrevious) head.previous = null;
     for (var token in tokens) {
       head.next = token;
@@ -113,15 +114,15 @@ abstract class TokenStreamRewriterTest {
     }
     int eofOffset = head.charOffset + head.lexeme.length;
     if (eofOffset < 0) eofOffset = 0;
-    Token eof = new SymbolToken.eof(eofOffset);
+    Token eof = new Token.eof(eofOffset);
     if (!setPrevious) eof.previous = null;
     head.next = eof;
     if (setPrevious) eof.previous = head;
     return eof;
   }
 
-  BeginGroupToken _makeBeginGroupToken(int charOffset) {
-    return new BeginGroupToken(TokenType.OPEN_PAREN, charOffset);
+  BeginToken _makeBeginGroupToken(int charOffset) {
+    return new BeginToken(TokenType.OPEN_PAREN, charOffset);
   }
 
   StringToken _makeToken(int charOffset, String text) {