Catch InterruptedException in CriteriaHelper

chrome/android/javatests/src/org/chromium/chrome/browser/feedback/ConnectivityTaskTest.java

 // Copyright 2015 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.feedback;
 
 import android.test.suitebuilder.annotation.MediumTest;
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.ThreadUtils;
@@ skipping 13 matching lines @@
 import java.util.concurrent.atomic.AtomicReference;
 
 /**
  * Tests for {@link ConnectivityTask}.
  */
 public class ConnectivityTaskTest extends ConnectivityCheckerTestBase {
     private static final int RESULT_CHECK_INTERVAL_MS = 10;
 
     @MediumTest
     @Feature({"Feedback"})
-    public void testNormalCaseShouldWork() throws InterruptedException {
+    public void testNormalCaseShouldWork() {
         final ConnectivityTask task = ThreadUtils.runOnUiThreadBlockingNoException(
                 new Callable<ConnectivityTask>() {
                     @Override
                     public ConnectivityTask call() {
                         // Intentionally make HTTPS-connection fail which should result in
                         // NOT_CONNECTED.
                         ConnectivityChecker.overrideUrlsForTest(mGenerate204Url, mGenerate404Url);
                         return ConnectivityTask.create(Profile.getLastUsedProfile(), TIMEOUT_MS,
                                 null);
                     }
@@ skipping 92 matching lines @@
         }
         FeedbackData feedback = feedbackRef.get();
         // In the case of a timeout when using callbacks, the result will be TIMEOUT instead
         // of UNKNOWN.
         verifyConnections(feedback, ConnectivityCheckResult.TIMEOUT);
         assertEquals("The timeout value is wrong.", checkTimeoutMs, feedback.getTimeoutMs());
     }
 
     @MediumTest
     @Feature({"Feedback"})
-    public void testTwoTimeoutsShouldFillInTheRest() throws InterruptedException {
+    public void testTwoTimeoutsShouldFillInTheRest() {
         final ConnectivityTask task = ThreadUtils.runOnUiThreadBlockingNoException(
                 new Callable<ConnectivityTask>() {
                     @Override
                     public ConnectivityTask call() {
                         // Intentionally make HTTPS connections slow which should result in
                         // UNKNOWN.
                         ConnectivityChecker.overrideUrlsForTest(mGenerate204Url,
                                 mGenerateSlowUrl);
                         return ConnectivityTask.create(Profile.getLastUsedProfile(), TIMEOUT_MS,
                                 null);
@@ skipping 47 matching lines @@
         final FeedbackData result = ThreadUtils.runOnUiThreadBlockingNoException(
                 new Callable<FeedbackData>() {
                     @Override
                     public FeedbackData call() {
                         return task.get();
                     }
                 });
         return result;
     }
 }