Finalise removing GuardedByFlags.

This was a bodge because we couldn't just inject flags deep down in the call hierarchy. Of course, we have DI now.

Startblock:
  cl-status javac.javabuilder contains feb0752 in prod
PiperOrigin-RevId: 828934377

Author: graememorgan

core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/GuardedByBinder.java

@@ -46,13 +46,6 @@
  * @author cushon@google.com (Liam Miller-Cushon)
  */
 public final class GuardedByBinder {
-
-  /** Stub method to allow removing the GuardedByFlags argument. */
-  public static Optional<GuardedByExpression> bindExpression(
-      JCTree.JCExpression exp, VisitorState visitorState, GuardedByFlags flags) {
-    return bindExpression(exp, visitorState);
-  }
-
   /**
    * Creates a {@link GuardedByExpression} from a bound AST node, or returns {@code
    * Optional.empty()} if the AST node doesn't correspond to a 'simple' lock expression.
@@ -73,12 +66,6 @@ public static Optional<GuardedByExpression> bindExpression(
     }
   }
 
-  /** Stub method to allow removing the GuardedByFlags argument. */
-  public static Optional<GuardedByExpression> bindString(
-      String string, GuardedBySymbolResolver resolver, GuardedByFlags flags) {
-    return bindString(string, resolver);
-  }
-
   /** Creates a {@link GuardedByExpression} from a string, given the resolution context. */
   public static Optional<GuardedByExpression> bindString(
       String string, GuardedBySymbolResolver resolver) {

core/src/main/java/com/google/errorprone/bugpatterns/threadsafety/GuardedByFlags.java

@@ -405,15 +405,6 @@ public static final class ExpectedLockCalculator {
 
     private static final GuardedByExpression.Factory F = new GuardedByExpression.Factory();
 
-    /** Stub method to allow removing the GuardedByFlags argument. */
-    public static Optional<GuardedByExpression> from(
-        JCTree.JCExpression guardedMemberExpression,
-        GuardedByExpression guard,
-        VisitorState state,
-        GuardedByFlags flags) {
-      return from(guardedMemberExpression, guard, state);
-    }
-
     /**
      * Determine the lock expression that needs to be held when accessing a specific guarded member.
      *