Given the current implementation of CallbackHelper, this may also involve moving Criteria and CriteriaHelper. I'd like us to be careful and considerate about doing so.

Yes, I moved CallbackHelper, Criteria, CriteriaHelper, and EqualityCriteria

CL: https://codereview.chromium.org/2428163002

Will try running all related test locally tonight to see if it cause any trouble

I'm less worried about them causing build/test failures and more worried about encouraging behavior that we don't necessarily want. CriteriaHelper in particular has been implicated as a possible source of test flake, and I think we may want to investigate that further before making it a public part of //base.

Created this to refactor Criteria stuff out of callbackhelper

https://codereview.chromium.org/2434473002

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/4fbb52a7c4d3ea3445b510c97c4114a1b6799a20

commit 4fbb52a7c4d3ea3445b510c97c4114a1b6799a20
Author: yolandyan <yolandyan@chromium.org>
Date: Thu Oct 20 01:07:06 2016

refactor waitUntilCriteria out of CallbackHelper

waitUntilCriteria is only used by one class, and in general, it seems redundant to
provide mechanism to both do a polling wait and lock on test thread until being
notified. The waitForCallback method should be enough.

BUG= 657162 

Review-Url: https://chromiumcodereview.appspot.com/2434473002
Cr-Commit-Position: refs/heads/master@{#426363}

[modify] https://crrev.com/4fbb52a7c4d3ea3445b510c97c4114a1b6799a20/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/CallbackHelper.java
[modify] https://crrev.com/4fbb52a7c4d3ea3445b510c97c4114a1b6799a20/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java

The following revision refers to this bug:
  https://chromium.googlesource.com/chromium/src.git/+/44c22c6fcaa63ad5ba558368523a73f212b32ffa

commit 44c22c6fcaa63ad5ba558368523a73f212b32ffa
Author: yolandyan <yolandyan@chromium.org>
Date: Thu Oct 20 20:28:16 2016

Refactor CallbackHelper and deps to base/test

TBR=danakj@chromium.org, tedchoc@chromium.org
BUG= 657162 

Review-Url: https://chromiumcodereview.appspot.com/2428163002
Cr-Commit-Position: refs/heads/master@{#426582}

[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/android_webview/javatests/src/org/chromium/android_webview/test/AndroidScrollIntegrationTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/android_webview/javatests/src/org/chromium/android_webview/test/AndroidViewIntegrationTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientCallbackHelperTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientGetDefaultVideoPosterTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientGetVideoLoadingProgressViewTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientOnUnhandledKeyEventTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldInterceptRequestTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientShouldOverrideUrlLoadingTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsClientVisitedHistoryTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsLifecycleNotifierTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsStaticsTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/android_webview/javatests/src/org/chromium/android_webview/test/AwImeTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/android_webview/javatests/src/org/chromium/android_webview/test/AwLegacyQuirksTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/android_webview/javatests/src/org/chromium/android_webview/test/AwQuotaManagerBridgeTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/android_webview/javatests/src/org/chromium/android_webview/test/FullScreenVideoTestAwContentsClient.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/android_webview/javatests/src/org/chromium/android_webview/test/LoadUrlTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/android_webview/javatests/src/org/chromium/android_webview/test/MediaAccessPermissionRequestTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/android_webview/javatests/src/org/chromium/android_webview/test/TestAwContentsClient.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/android_webview/javatests/src/org/chromium/android_webview/test/TestAwServiceWorkerClient.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/android_webview/javatests/src/org/chromium/android_webview/test/VisualStateTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/android_webview/javatests/src/org/chromium/android_webview/test/WebViewModalDialogOverrideTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/android_webview/javatests/src/org/chromium/android_webview/test/util/AwQuotaManagerBridgeTestUtil.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/android_webview/javatests/src/org/chromium/android_webview/test/util/CookieUtils.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/android_webview/tools/automated_ui_tests/BUILD.gn
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/android_webview/tools/automated_ui_tests/javatests/src/org/chromium/webview_ui_test/test/util/WebViewSyncWrapper.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/android_webview/tools/system_webview_shell/page_cycler/src/org/chromium/webview_shell/page_cycler/PageCyclerTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/base/BUILD.gn
[rename] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/base/test/android/javatests/src/org/chromium/base/test/util/CallbackHelper.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/GeolocationTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/HistoryUITest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/PopularUrlsTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/PowerBroadcastReceiverTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/SmartClipProviderTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/TabTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/TabThemeTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/WebShareTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/autofill/AutofillTestHelper.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/compositor/overlays/strip/TabStripTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/contextmenu/ContextMenuTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/contextualsearch/ContextualSearchManagerTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTestBase.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabTabPersistencePolicyTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadActivityTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/download/DownloadTestBase.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/download/ui/DownloadHistoryAdapterTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/download/ui/StubbedProvider.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/externalnav/UrlOverridingTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/fullscreen/FullscreenManagerTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/hardware_acceleration/ToastHWATest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/hardware_acceleration/Utils.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/infobar/InfoBarContainerTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/media/ui/MediaPermissionsTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/omnibox/UrlBarTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/partnercustomizations/PartnerHomepageIntegrationTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/preferences/PreferencesTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/push_messaging/PushMessagingTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/DocumentModeAssassinTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabPersistentStoreTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/UndoTabModelTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetectorFetcherTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/ManifestUpgradeDetectorTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/TestFetchStorageCallback.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappActivityTestBase.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/javatests/src/org/chromium/chrome/browser/widget/OverviewListLayoutTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/webapk/libs/runtime_library/javatests/src/org/chromium/webapk/lib/runtime_library/WebApkServiceImplTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/android/webapk/shell_apk/javatests/src/org/chromium/webapk/shell_apk/DexLoaderTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeTabbedActivityTestBase.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ApplicationTestUtils.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/test/android/javatests/src/org/chromium/chrome/test/util/BookmarkTestUtil.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/test/android/javatests/src/org/chromium/chrome/test/util/ChromeTabUtils.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/TabLoadObserver.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/TabTitleObserver.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/contextmenu/ContextMenuUtils.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/content/public/android/javatests/src/org/chromium/content/browser/ScreenOrientationListenerTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/content/public/android/javatests/src/org/chromium/content/browser/WebContentsObserverAndroidTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/content/public/android/javatests/src/org/chromium/content/browser/webcontents/AccessibilitySnapshotTest.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/content/public/test/android/BUILD.gn
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/HistoryUtils.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java
[modify] https://crrev.com/44c22c6fcaa63ad5ba558368523a73f212b32ffa/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java