more work aligning fasta.Token with analyzer.Token

pkg/front_end/test/scanner_replacement_test.dart

Index: pkg/front_end/test/scanner_replacement_test.dart
diff --git a/pkg/front_end/test/scanner_replacement_test.dart b/pkg/front_end/test/scanner_replacement_test.dart
index 6133db830965ba4265fe7e5b31349a4b7aa2a9f6..e1d5908706d108fdb225550bc576bb0f97d035c1 100644
--- a/pkg/front_end/test/scanner_replacement_test.dart
+++ b/pkg/front_end/test/scanner_replacement_test.dart
@@ -319,7 +319,7 @@ class ScannerTest_Replacement extends ScannerTest {
       });
       token = token.next;
     }
-    if (!token.previousToken.isEof) {
+    if (!token.previous.isEof) {
       var head = new fasta.SymbolToken(analyzer.TokenType.EOF, -1);
       token.previous = head;
       head.next = token;
@@ -331,7 +331,7 @@ class ScannerTest_Replacement extends ScannerTest {
   void assertValidTokenStream(fasta.Token firstToken,
       {bool errorsFirst: false}) {
     fasta.Token token = firstToken;
-    fasta.Token previous = token.previousToken;
+    fasta.Token previous = token.previous;
     expect(previous.isEof, isTrue, reason: 'Missing leading EOF');
     expect(previous.next, token, reason: 'Invalid leading EOF');
     expect(previous.previous, previous, reason: 'Invalid leading EOF');