Reland "Remove deprecated methods in CallbackHelper.java"

This reverts commit 3455d426.

Reason for reland: restored proper dependent CL

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

Bug: 1000510
Change-Id: I5df68e7d90894a558b35bde90be9b8248eb8c7f9
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1788019
Commit-Queue: Andrew Grieve <agrieve@chromium.org>
Reviewed-by: Bo <boliu@chromium.org>
Reviewed-by: Ian Clelland <iclelland@chromium.org>
Reviewed-by: Andrew Grieve <agrieve@chromium.org>
Cr-Commit-Position: refs/heads/master@{#694765}

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

@@ -226,20 +226,6 @@ 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,9 +103,8 @@ public class PrintingControllerTest {
     }
 
     private static class WaitForOnWriteHelper extends CallbackHelper {
-        @Override
         public void waitForCallback(String msg) throws InterruptedException, TimeoutException {
-            waitForCallback(msg, 0, 1, TEST_TIMEOUT, TimeUnit.MILLISECONDS);
+            waitForFirst(msg, TEST_TIMEOUT, TimeUnit.MILLISECONDS);
         }
     }