flatten Keyword into TokenType

pkg/front_end/test/token_test.dart

 // Copyright (c) 2017, 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.
 
 import 'package:front_end/src/fasta/scanner/string_scanner.dart';
 import 'package:front_end/src/fasta/scanner/token.dart' as fasta;
 import 'package:front_end/src/scanner/token.dart';
 import 'package:front_end/src/scanner/reader.dart' as analyzer;
 import 'package:test/test.dart';
 import 'package:test_reflective_loader/test_reflective_loader.dart';
@@ skipping 131 matching lines @@
     expect(token.isSynthetic, false);
     expect(token.precedingComments.isSynthetic, false);
     expect(token.previous.isSynthetic, true);
     expect(token.next.isEof, true);
     expect(token.next.isSynthetic, true);
   }
 
   void test_matchesAny() {
     var scanner = new StringScanner('true', includeComments: true);
     var token = scanner.tokenize();
-    expect(token.matchesAny([TokenType.KEYWORD]), true);
-    expect(token.matchesAny([TokenType.AMPERSAND, TokenType.KEYWORD]), true);
+    expect(token.matchesAny([Keyword.TRUE]), true);
+    expect(token.matchesAny([TokenType.AMPERSAND, Keyword.TRUE]), true);
     expect(token.matchesAny([TokenType.AMPERSAND]), false);
   }
 
   void test_built_in_keywords() {
     var builtInKeywords = new Set<Keyword>.from([
       Keyword.ABSTRACT,
       Keyword.AS,
       Keyword.COVARIANT,
       Keyword.DEFERRED,
       Keyword.DYNAMIC,
@@ skipping 47 matching lines @@
     // General tokens
     token = token.next;
     expect(token.lexeme, '&');
     expect(token.value(), '&');
     // String tokens
     token = token.next;
     expect(token.lexeme, '"home"');
     expect(token.value(), '"home"');
   }
 }