Catch InterruptedException in CriteriaHelper

chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java
index 0507e19a1425df13f94528b7fd64e2504966e4ba..edc875b516bd2595816b496e8d895f5140d5e14f 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/payments/PaymentRequestTestBase.java
@@ -573,7 +573,7 @@ abstract class PaymentRequestTestBase extends ChromeActivityTestCaseBase<ChromeT
     }
 
     /** Verifies the contents of the test webpage. */
-    protected void expectResultContains(final String[] contents) throws InterruptedException {
+    protected void expectResultContains(final String[] contents) {
         CriteriaHelper.pollInstrumentationThread(new Criteria() {
             @Override
             public boolean isSatisfied() {
@@ -603,8 +603,7 @@ abstract class PaymentRequestTestBase extends ChromeActivityTestCaseBase<ChromeT
     }
 
     /**  Will fail if the OptionRow at |index| is not selected in Contact Details.*/
-    protected void expectContactDetailsRowIsSelected(final int index)
-            throws ExecutionException, InterruptedException {
+    protected void expectContactDetailsRowIsSelected(final int index) {
         CriteriaHelper.pollInstrumentationThread(new Criteria() {
             @Override
             public boolean isSatisfied() {
@@ -620,8 +619,7 @@ abstract class PaymentRequestTestBase extends ChromeActivityTestCaseBase<ChromeT
     }
 
     /**  Will fail if the OptionRow at |index| is not selected in Shipping Address section.*/
-    protected void expectShippingAddressRowIsSelected(final int index)
-            throws ExecutionException, InterruptedException {
+    protected void expectShippingAddressRowIsSelected(final int index) {
         CriteriaHelper.pollInstrumentationThread(new Criteria() {
             @Override
             public boolean isSatisfied() {
@@ -637,8 +635,7 @@ abstract class PaymentRequestTestBase extends ChromeActivityTestCaseBase<ChromeT
     }
 
     /**  Will fail if the OptionRow at |index| is not selected in PaymentMethod section.*/
-    protected void expectPaymentMethodRowIsSelected(final int index)
-            throws ExecutionException, InterruptedException {
+    protected void expectPaymentMethodRowIsSelected(final int index) {
         CriteriaHelper.pollInstrumentationThread(new Criteria() {
             @Override
             public boolean isSatisfied() {