Catch InterruptedException in CriteriaHelper

chrome/android/javatests/src/org/chromium/chrome/browser/ntp/NewTabPageTest.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.ntp;
 
 import android.graphics.Canvas;
 import android.test.UiThreadTest;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.test.suitebuilder.annotation.MediumTest;
@@ skipping 96 matching lines @@
         assertTrue(mTab.getNativePage() instanceof NewTabPage);
         mNtp = (NewTabPage) mTab.getNativePage();
         mFakebox = mNtp.getView().findViewById(R.id.search_box);
         mMostVisitedLayout = (ViewGroup) mNtp.getView().findViewById(R.id.most_visited_layout);
         assertEquals(mFakeMostVisitedUrls.length, mMostVisitedLayout.getChildCount());
     }
 
     @MediumTest
     @Feature({"NewTabPage", "RenderTest"})
     @CommandLineFlags.Add("enable-features=NTPSnippets")
-    public void testRender() throws IOException, InterruptedException {
+    public void testRender() throws IOException {
         ViewRenderer viewRenderer = new ViewRenderer(getActivity(),
                 "chrome/test/data/android/render_tests", "NewTabPageTest");
         viewRenderer.renderAndCompare(mMostVisitedLayout, "most_visited");
         viewRenderer.renderAndCompare(mFakebox, "fakebox");
         viewRenderer.renderAndCompare(mNtp.getView().getRootView(), "new_tab_page");
 
         // Scroll to search bar
         final NewTabPageRecyclerView recyclerView =
                 (NewTabPageRecyclerView) mNtp.getNewTabPageView().getWrapperView();
 
@@ skipping 269 matching lines @@
 
     private boolean getUrlFocusAnimatonsDisabled() {
         return ThreadUtils.runOnUiThreadBlockingNoException(new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
                 return mNtp.getNewTabPageView().urlFocusAnimationsDisabled();
             }
         });
     }
 
-    private void waitForUrlFocusAnimationsDisabledState(boolean disabled)
-            throws InterruptedException {
+    private void waitForUrlFocusAnimationsDisabledState(boolean disabled) {
         CriteriaHelper.pollInstrumentationThread(Criteria.equals(disabled, new Callable<Boolean>() {
             @Override
             public Boolean call() {
                 return getUrlFocusAnimatonsDisabled();
             }
         }));
     }
 
-    private void waitForTabLoading() throws InterruptedException {
+    private void waitForTabLoading() {
         CriteriaHelper.pollUiThread(new Criteria() {
             @Override
             public boolean isSatisfied() {
                 return mTab.isLoading();
             }
         });
     }
 
     private void waitForFakeboxFocusAnimationComplete(NewTabPage ntp) throws InterruptedException {
         waitForUrlFocusPercent(ntp, 1f);
     }
 
-    private void waitForUrlFocusPercent(final NewTabPage ntp, float percent)
-            throws InterruptedException {
+    private void waitForUrlFocusPercent(final NewTabPage ntp, float percent) {
         CriteriaHelper.pollUiThread(Criteria.equals(percent, new Callable<Float>() {
             @Override
             public Float call() {
                 return ntp.getNewTabPageView().getUrlFocusChangeAnimationPercent();
             }
         }));
     }
 
     private void clickFakebox() {
         View fakebox = mNtp.getView().findViewById(R.id.search_box);
@@ skipping 11 matching lines @@
                 int[] location = new int[2];
                 fakebox.getLocationInWindow(location);
                 return location[1];
             }
         });
     }
 
     /**
      * Waits until the top of the fakebox reaches the given position.
      */
-    private void waitForFakeboxTopPosition(final NewTabPage ntp, int position)
-            throws InterruptedException {
+    private void waitForFakeboxTopPosition(final NewTabPage ntp, int position) {
         CriteriaHelper.pollUiThread(Criteria.equals(position, new Callable<Integer>() {
             @Override
             public Integer call() {
                 return getFakeboxTop(ntp);
             }
         }));
     }
 }