Revert "Remove deprecated methods in CallbackHelper.java"

This reverts commit a5c0d47c.

Reason for revert: Breaks Android build:
https://ci.chromium.org/p/chromium/builders/ci/android-archive-rel/4323

Original change's description:
> Remove deprecated methods in CallbackHelper.java
> 
> Bug: 1000510
> Change-Id: I6d26647c389b75bbc37dcc0fbafc18d25e84285b
> Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1785102
> Commit-Queue: Andrew Grieve <agrieve@chromium.org>
> Reviewed-by: Bo <boliu@chromium.org>
> Auto-Submit: Andrew Grieve <agrieve@chromium.org>
> Cr-Commit-Position: refs/heads/master@{#693693}

TBR=boliu@chromium.org,agrieve@chromium.org

Change-Id: I332fe630da34560893ccc1ca470624f067db3428
No-Presubmit: true
No-Tree-Checks: true
No-Try: true
Bug: 1000510
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1787353Reviewed-by: Ian Clelland <iclelland@chromium.org>
Commit-Queue: Ian Clelland <iclelland@chromium.org>
Cr-Commit-Position: refs/heads/master@{#693726}

base/test/android/javatests/src/org/chromium/base/test/util/CallbackHelper.java

@@ -228,6 +228,20 @@ public class CallbackHelper {
         waitForCallback(null, currentCallCount, 1, WAIT_TIMEOUT_SECONDS, TimeUnit.SECONDS);
     }
 
+    /**
+     * @deprecated Use waitForAnyCallback() instead.
+     */
+    public void waitForCallback(String msg) throws InterruptedException, TimeoutException {
+        waitForCallback(msg, getCallCount());
+    }
+
+    /**
+     * @deprecated Use waitForAnyCallback() instead.
+     */
+    public void waitForCallback() throws InterruptedException, TimeoutException {
+        waitForCallback(getCallCount());
+    }
+
     /**
      * Wait until the callback has been called once.
      */

chrome/android/javatests/src/org/chromium/chrome/browser/printing/PrintingControllerTest.java

@@ -103,8 +103,9 @@ public class PrintingControllerTest {
     }
 
     private static class WaitForOnWriteHelper extends CallbackHelper {
+        @Override
         public void waitForCallback(String msg) throws InterruptedException, TimeoutException {
-            waitForFirst(msg, TEST_TIMEOUT, TimeUnit.MILLISECONDS);
+            waitForCallback(msg, 0, 1, TEST_TIMEOUT, TimeUnit.MILLISECONDS);
         }
     }