[element model] cleanup migrated utilities

Change-Id: I560fe2550189801a833359fbe9e06219f40a3cc3
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/390662
Auto-Submit: Phil Quitslund <[email protected]>
Reviewed-by: Brian Wilkerson <[email protected]>
Commit-Queue: Brian Wilkerson <[email protected]>

Author: pq

pkg/linter/lib/src/rules/avoid_print.dart

@@ -50,7 +50,7 @@ class _Visitor extends SimpleAstVisitor<void> {
       var parent = node.parent;
       if (parent is IfStatement && node == parent.thenStatement) {
         var condition = parent.expression;
-        if (condition is SimpleIdentifier && isKDebugMode2(condition.element)) {
+        if (condition is SimpleIdentifier && isKDebugMode(condition.element)) {
           return true;
         }
       } else if (parent is FunctionBody) {

pkg/linter/lib/src/rules/no_logic_in_create_state.dart

@@ -41,7 +41,7 @@ class _Visitor extends SimpleAstVisitor<void> {
 
     var parent = node.parent;
     if (parent is! ClassDeclaration ||
-        !isStatefulWidget2(parent.declaredFragment?.element)) {
+        !isStatefulWidget(parent.declaredFragment?.element)) {
       return;
     }
     var body = node.body;

pkg/linter/lib/src/util/flutter_utils.dart

@@ -36,18 +36,13 @@ bool isExactWidgetTypeContainer(DartType? type) =>
 bool isExactWidgetTypeSizedBox(DartType? type) =>
     _flutter.isExactWidgetTypeSizedBox(type);
 
-bool isKDebugMode(Element? element) => _flutter.isKDebugMode(element);
-
-bool isKDebugMode2(Element2? element) => _flutter.isKDebugMode2(element);
+bool isKDebugMode(Element2? element) => _flutter.isKDebugMode(element);
 
 bool isState(InterfaceElement element) => _flutter.isState(element);
 
-bool isStatefulWidget(ClassElement? element) =>
+bool isStatefulWidget(ClassElement2? element) =>
     element != null && _flutter.isStatefulWidget(element);
 
-bool isStatefulWidget2(ClassElement2? element) =>
-    element != null && _flutter.isStatefulWidget2(element);
-
 bool isWidgetProperty(DartType? type) {
   if (isWidgetType(type)) {
     return true;
@@ -133,12 +128,7 @@ class _Flutter {
       type is InterfaceType &&
       isExactly(type.element, _nameSizedBox, _uriBasic);
 
-  bool isKDebugMode(Element? element) =>
-      element != null &&
-      element.name == 'kDebugMode' &&
-      element.source?.uri == _uriFoundation;
-
-  bool isKDebugMode2(Element2? element) =>
+  bool isKDebugMode(Element2? element) =>
       element != null &&
       element.name == 'kDebugMode' &&
       element.library2.uri == _uriFoundation;
@@ -148,12 +138,7 @@ class _Flutter {
       element.allSupertypes
           .any((type) => isExactly(type.element, _nameState, _uriFramework));
 
-  bool isStatefulWidget(ClassElement element) =>
-      isExactly(element, _nameStatefulWidget, _uriFramework) ||
-      element.allSupertypes.any((type) =>
-          isExactly(type.element, _nameStatefulWidget, _uriFramework));
-
-  bool isStatefulWidget2(ClassElement2 element) =>
+  bool isStatefulWidget(ClassElement2 element) =>
       isExactly2(element, _nameStatefulWidget, _uriFramework) ||
       element.allSupertypes.any((type) =>
           isExactly(type.element, _nameStatefulWidget, _uriFramework));