merge fasta.Keyword into analyzer.Keyword

pkg/analysis_server/lib/src/services/refactoring/naming_conventions.dart

Index: pkg/analysis_server/lib/src/services/refactoring/naming_conventions.dart
diff --git a/pkg/analysis_server/lib/src/services/refactoring/naming_conventions.dart b/pkg/analysis_server/lib/src/services/refactoring/naming_conventions.dart
index 7b5dab2fb1e1f17c7f40c9e195736f8d538b6265..b622c32db8959759086bc8e49a41656ea134782c 100644
--- a/pkg/analysis_server/lib/src/services/refactoring/naming_conventions.dart
+++ b/pkg/analysis_server/lib/src/services/refactoring/naming_conventions.dart
@@ -6,7 +6,7 @@ library services.src.refactoring.naming_conventions;
 
 import 'package:analysis_server/src/services/correction/status.dart';
 import 'package:analysis_server/src/services/correction/strings.dart';
-import 'package:front_end/src/fasta/scanner/keyword.dart' as fasta;
+import 'package:front_end/src/scanner/token.dart' show Keyword;
 
 /**
  * Returns the [RefactoringStatus] with severity:
@@ -167,7 +167,7 @@ RefactoringStatus _validateIdentifier(
   }
   // keyword
   {
-    fasta.Keyword keyword = fasta.Keyword.keywords[identifier];
+    Keyword keyword = Keyword.keywords[identifier];
     if (keyword != null) {
       String message = "$desc must not be a keyword.";
       return new RefactoringStatus.fatal(message);