[Signin][Android] Remove onPolicyFetchedBeforeSignIn

Bug: None
Change-Id: I44ce5e128389a0a64f310e5b6d9d26a0ae231710
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1823118
Auto-Submit: Boris Sazonov <bsazonov@chromium.org>
Reviewed-by: Pâris Meuleman <pmeuleman@chromium.org>
Reviewed-by: Alex Ilin <alexilin@chromium.org>
Commit-Queue: Boris Sazonov <bsazonov@chromium.org>
Cr-Commit-Position: refs/heads/master@{#700302}

chrome/android/java/src/org/chromium/chrome/browser/signin/SigninManager.java

@@ -451,19 +451,16 @@ public class SigninManager
         assert mSignInState.mCoreAccountInfo != null;
 
         Log.d(TAG, "Checking if account has policy management enabled");
-        fetchAndApplyCloudPolicy(mSignInState.mCoreAccountInfo, this::onPolicyFetchedBeforeSignIn);
+        fetchAndApplyCloudPolicy(
+                mSignInState.mCoreAccountInfo, this::finishSignInAfterPolicyEnforced);
     }
 
-    @VisibleForTesting
     /**
-     * If the user is managed, its policy has been fetched and is being enforced; features like sync
-     * may now be disabled by policy, and the rest of the sign-in flow can be resumed.
+     * Finishes the sign-in flow. If the user is managed, the policy should be fetched and enforced
+     * before calling this method.
      */
-    void onPolicyFetchedBeforeSignIn() {
-        finishSignIn();
-    }
-
-    private void finishSignIn() {
+    @VisibleForTesting
+    void finishSignInAfterPolicyEnforced() {
         // This method should be called at most once per sign-in flow.
         assert mSignInState != null && mSignInState.mCoreAccountInfo != null;
 

chrome/android/junit/src/org/chromium/chrome/browser/signin/SigninManagerTest.java

@@ -245,7 +245,7 @@ public class SigninManagerTest {
         mSigninManager.runAfterOperationInProgress(callCount::incrementAndGet);
         assertEquals(0, callCount.get());
 
-        mSigninManager.onPolicyFetchedBeforeSignIn();
+        mSigninManager.finishSignInAfterPolicyEnforced();
         assertFalse(mSigninManager.isOperationInProgress());
         assertEquals(1, callCount.get());
     }