Catch InterruptedException in CriteriaHelper

content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java

Index: content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java
diff --git a/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java b/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java
index ece559750d4ff0581d64bf9221a1f71b33964afa..3fa2a4deb28cfaefd9f59d8f5d1f6d24de18b4f8 100644
--- a/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java
+++ b/content/shell/android/javatests/src/org/chromium/content_shell_apk/ContentShellTestBase.java
@@ -97,9 +97,8 @@ public class ContentShellTestBase
      * Starts the content shell activity with the provided test url.
      * The url is synchronously loaded.
      * @param url Test url to load.
-     * @throws InterruptedException
      */
-    protected void startActivityWithTestUrl(String url) throws InterruptedException {
+    protected void startActivityWithTestUrl(String url) {
         launchContentShellWithUrl(UrlUtils.getIsolatedTestFileUrl(url));
         assertNotNull(getActivity());
         waitForActiveShellToBeDoneLoading();
@@ -126,9 +125,8 @@ public class ContentShellTestBase
      * WAIT_FOR_ACTIVE_SHELL_LOADING_TIMEOUT milliseconds and it shouldn't be used for long
      * loading pages. Instead it should be used more for test initialization. The proper way
      * to wait is to use a TestCallbackHelperContainer after the initial load is completed.
-     * @throws InterruptedException
      */
-    protected void waitForActiveShellToBeDoneLoading() throws InterruptedException {
+    protected void waitForActiveShellToBeDoneLoading() {
         final ContentShellActivity activity = getActivity();
 
         // Wait for the Content Shell to be initialized.
@@ -162,9 +160,8 @@ public class ContentShellTestBase
      * @param url The URL to create the new {@link Shell} with.
      * @return A new instance of a {@link Shell}.
      * @throws ExecutionException
-     * @throws InterruptedException
      */
-    protected Shell loadNewShell(final String url) throws ExecutionException, InterruptedException {
+    protected Shell loadNewShell(final String url) throws ExecutionException {
         Shell shell = ThreadUtils.runOnUiThreadBlocking(new Callable<Shell>() {
             @Override
             public Shell call() {
@@ -222,8 +219,7 @@ public class ContentShellTestBase
      * Waits till the ContentViewCore receives the expected page scale factor
      * from the compositor and asserts that this happens.
      */
-    protected void assertWaitForPageScaleFactorMatch(float expectedScale)
-            throws InterruptedException {
+    protected void assertWaitForPageScaleFactorMatch(float expectedScale) {
         CriteriaHelper.pollInstrumentationThread(
                 Criteria.equals(expectedScale, new Callable<Float>() {
                     @Override