Use Entity instead of Element in ConstantValue

pkg/compiler/lib/src/js_emitter/constant_ordering.dart

Index: pkg/compiler/lib/src/js_emitter/constant_ordering.dart
diff --git a/pkg/compiler/lib/src/js_emitter/constant_ordering.dart b/pkg/compiler/lib/src/js_emitter/constant_ordering.dart
index 6baa37715ca9da7846bda34108fae31c2fb35e76..ac692fa09744a7fd45abe821c718f66f3da19bbf 100644
--- a/pkg/compiler/lib/src/js_emitter/constant_ordering.dart
+++ b/pkg/compiler/lib/src/js_emitter/constant_ordering.dart
@@ -6,7 +6,8 @@ library dart2js.js_emitter.constant_ordering;
 
 import '../constants/values.dart';
 import '../dart_types.dart';
-import '../elements/elements.dart' show Element, Elements, FieldElement;
+import '../elements/elements.dart' show Entity, Elements;
+import '../elements/entities.dart' show FieldEntity;
 import '../js_backend/js_backend.dart' show SyntheticConstantKind;
 import '../tree/dartstring.dart' show DartString;
 
@@ -44,7 +45,7 @@ class _CompareVisitor implements ConstantValueVisitor<int, ConstantValue> {
     return 0;
   }
 
-  static int compareElements(Element a, Element b) {
+  static int compareElements(Entity a, Entity b) {
     int r = a.name.compareTo(b.name);
     if (r != 0) return r;
     return Elements.compareByPosition(a, b);
@@ -119,8 +120,8 @@ class _CompareVisitor implements ConstantValueVisitor<int, ConstantValue> {
     int r = compareDartTypes(a.type, b.type);
     if (r != 0) return r;
 
-    List<FieldElement> aFields = a.fields.keys.toList()..sort(compareElements);
-    List<FieldElement> bFields = b.fields.keys.toList()..sort(compareElements);
+    List<FieldEntity> aFields = a.fields.keys.toList()..sort(compareElements);
+    List<FieldEntity> bFields = b.fields.keys.toList()..sort(compareElements);
 
     r = compareLists(compareElements, aFields, bFields);
     if (r != 0) return r;