Catch InterruptedException in CriteriaHelper

chrome/android/javatests/src/org/chromium/chrome/browser/tabmodel/TabModelMergingTest.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.tabmodel;
 
 import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_NON_LOW_END_DEVICE;
 
 import android.annotation.TargetApi;
 import android.app.Activity;
@@ skipping 137 matching lines @@
         }
         for (int i = 0; i < 3; i++) {
             mMergeIntoActivity2ExpectedTabs[i] =
                     mActivity2.getTabModelSelector().getModel(false).getTabAt(i).getUrl();
             mMergeIntoActivity1ExpectedTabs[i + 4] =
                     mActivity2.getTabModelSelector().getModel(false).getTabAt(i).getUrl();
         }
     }
 
     private void mergeTabsAndAssert(final ChromeTabbedActivity activity,
-            final String[] expectedTabUrls) throws InterruptedException {
+            final String[] expectedTabUrls) {
         String selectedTabUrl = activity.getTabModelSelector().getCurrentTab().getUrl();
         mergeTabsAndAssert(activity, expectedTabUrls, expectedTabUrls.length, selectedTabUrl);
     }
 
     /**
      * Merges tabs into the provided activity and asserts that the tab model looks as expected.
      * @param activity The activity to merge into.
      * @param expectedTabUrls The expected ordering of normal tab URLs after the merge.
      * @param expectedNumberOfTabs The expected number of tabs after the merge.
      * @param expectedSelectedTabUrl The expected URL of the selected tab after the merge.
      */
     private void mergeTabsAndAssert(final ChromeTabbedActivity activity,
             final String[] expectedTabUrls, final int expectedNumberOfTabs,
-            String expectedSelectedTabUrl) throws InterruptedException {
+            String expectedSelectedTabUrl) {
         // Merge tabs into the activity.
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 activity.maybeMergeTabs();
             }
         });
 
         // Wait for all tabs to be merged into the activity.
         CriteriaHelper.pollUiThread(new Criteria() {
@@ skipping 18 matching lines @@
     }
 
     /**
      * Starts a new ChromeTabbedActivity and asserts that the tab model looks as expected.
      * @param intent The intent to launch the new activity.
      * @param expectedSelectedTabUrl The URL of the tab that's expected to be selected.
      * @param expectedTabUrls The expected ordering of tab URLs after the merge.
      * @return The newly created ChromeTabbedActivity.
      */
     private ChromeTabbedActivity startNewChromeTabbedActivityAndAssert(Intent intent,
-            String expectedSelectedTabUrl, String[] expectedTabUrls)
-            throws InterruptedException {
+            String expectedSelectedTabUrl, String[] expectedTabUrls) {
         final ChromeTabbedActivity newActivity =
                 (ChromeTabbedActivity) getInstrumentation().startActivitySync(intent);
 
         // Wait for the tab state to be initialized.
         CriteriaHelper.pollUiThread(new Criteria() {
             @Override
             public boolean isSatisfied() {
                 return newActivity.getTabModelSelector().isTabStateInitialized();
             }
         });
@@ skipping 165 matching lines @@
                 5, mActivity1.getTabModelSelector().getTotalTabCount());
         assertEquals("Wrong number of incognito tabs in ChromeTabbedActivity2",
                 1, mActivity2.getTabModelSelector().getModel(true).getCount());
         assertEquals("Wrong number of tabs in ChromeTabbedActivity2",
                 4, mActivity2.getTabModelSelector().getTotalTabCount());
 
         String selectedUrl = mActivity1.getTabModelSelector().getCurrentTab().getUrl();
         mergeTabsAndAssert(mActivity1, mMergeIntoActivity1ExpectedTabs, 9, selectedUrl);
     }
 }