Catch InterruptedException in CriteriaHelper

chrome/android/javatests/src/org/chromium/chrome/browser/snackbar/SnackbarTest.java

 // Copyright 2016 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 package org.chromium.chrome.browser.snackbar;
 
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.ThreadUtils;
@@ skipping 32 matching lines @@
 
     @Override
     public void startMainActivity() throws InterruptedException {
         SnackbarManager.setDurationForTesting(1000);
         startMainActivityOnBlankPage();
         mManager = getActivity().getSnackbarManager();
     }
 
     @MediumTest
     @RetryOnFailure
-    public void testStackQueueOrder() throws InterruptedException {
+    public void testStackQueueOrder() {
         final Snackbar stackbar = Snackbar.make("stack", mDefaultController,
                 Snackbar.TYPE_ACTION, Snackbar.UMA_TEST_SNACKBAR);
         final Snackbar queuebar = Snackbar.make("queue", mDefaultController,
                 Snackbar.TYPE_NOTIFICATION, Snackbar.UMA_TEST_SNACKBAR);
         ThreadUtils.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 mManager.showSnackbar(stackbar);
             }
         });
@@ skipping 21 matching lines @@
         CriteriaHelper.pollUiThread(new Criteria("Snackbar did not time out") {
             @Override
             public boolean isSatisfied() {
                 return !mManager.isShowing();
             }
         });
     }
 
     @SmallTest
     @RetryOnFailure
-    public void testQueueStackOrder() throws InterruptedException {
+    public void testQueueStackOrder() {
         final Snackbar stackbar = Snackbar.make("stack", mDefaultController,
                 Snackbar.TYPE_ACTION, Snackbar.UMA_TEST_SNACKBAR);
         final Snackbar queuebar = Snackbar.make("queue", mDefaultController,
                 Snackbar.TYPE_NOTIFICATION, Snackbar.UMA_TEST_SNACKBAR);
         ThreadUtils.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 mManager.showSnackbar(queuebar);
             }
         });
@@ skipping 19 matching lines @@
                 });
         CriteriaHelper.pollUiThread(new Criteria("Snackbar did not time out") {
             @Override
             public boolean isSatisfied() {
                 return !mManager.isShowing();
             }
         });
     }
 
     @SmallTest
-    public void testDismissSnackbar() throws InterruptedException {
+    public void testDismissSnackbar() {
         final Snackbar snackbar = Snackbar.make("stack", mDismissController,
                 Snackbar.TYPE_ACTION, Snackbar.UMA_TEST_SNACKBAR);
         mDismissed = false;
         ThreadUtils.runOnUiThread(new Runnable() {
             @Override
             public void run() {
                 mManager.showSnackbar(snackbar);
             }
         });
         CriteriaHelper.pollUiThread(
@@ skipping 11 matching lines @@
             }
         });
         CriteriaHelper.pollUiThread(new Criteria("Snackbar did not time out") {
             @Override
             public boolean isSatisfied() {
                 return !mManager.isShowing() && mDismissed;
             }
         });
     }
 }