Catch InterruptedException in CriteriaHelper

chrome/android/javatests/src/org/chromium/chrome/browser/BindingManagerIntegrationTest.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;
 
 import android.content.Context;
 import android.test.MoreAsserts;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.util.SparseArray;
@@ skipping 35 matching lines @@
 public class BindingManagerIntegrationTest extends ChromeActivityTestCaseBase<ChromeActivity> {
 
     private static class MockBindingManager implements BindingManager {
         // Maps pid to the last received visibility state of the renderer.
         private final SparseBooleanArray mProcessInForegroundMap = new SparseBooleanArray();
         // Maps pid to a string recording calls to setInForeground() and visibilityDetermined().
         private final SparseArray<String> mVisibilityCallsMap = new SparseArray<String>();
         private boolean mIsReleaseAllModerateBindingsCalled;
 
         void assertIsInForeground(final int pid) {
-            try {
-                CriteriaHelper.pollInstrumentationThread(new Criteria() {
-                    @Override
-                    public boolean isSatisfied() {
-                        return mProcessInForegroundMap.get(pid);
-                    }
-                });
-            } catch (InterruptedException ie) {
-                fail();
-            }
+            CriteriaHelper.pollInstrumentationThread(new Criteria() {
+                @Override
+                public boolean isSatisfied() {
+                    return mProcessInForegroundMap.get(pid);
+                }
+            });
         }
 
         void assertIsInBackground(final int pid) {
-            try {
-                CriteriaHelper.pollInstrumentationThread(new Criteria() {
-                    @Override
-                    public boolean isSatisfied() {
-                        return !mProcessInForegroundMap.get(pid);
-                    }
-                });
-            } catch (InterruptedException ie) {
-                fail();
-            }
+            CriteriaHelper.pollInstrumentationThread(new Criteria() {
+                @Override
+                public boolean isSatisfied() {
+                    return !mProcessInForegroundMap.get(pid);
+                }
+            });
         }
 
         void assertSetInForegroundWasCalled(String message, final int pid) {
-            try {
-                CriteriaHelper.pollInstrumentationThread(new Criteria(message) {
-                    @Override
-                    public boolean isSatisfied() {
-                        return mProcessInForegroundMap.indexOfKey(pid) >= 0;
-                    }
-                });
-            } catch (InterruptedException ie) {
-                fail();
-            }
+            CriteriaHelper.pollInstrumentationThread(new Criteria(message) {
+                @Override
+                public boolean isSatisfied() {
+                    return mProcessInForegroundMap.indexOfKey(pid) >= 0;
+                }
+            });
         }
 
         void assertIsReleaseAllModerateBindingsCalled() {
-            try {
-                CriteriaHelper.pollInstrumentationThread(new Criteria() {
-                    @Override
-                    public boolean isSatisfied() {
-                        return mIsReleaseAllModerateBindingsCalled;
-                    }
-                });
-            } catch (InterruptedException ie) {
-                fail();
-            }
+            CriteriaHelper.pollInstrumentationThread(new Criteria() {
+                @Override
+                public boolean isSatisfied() {
+                    return mIsReleaseAllModerateBindingsCalled;
+                }
+            });
         }
 
         String getVisibilityCalls(int pid) {
             synchronized (mVisibilityCallsMap) {
                 return mVisibilityCallsMap.get(pid);
             }
         }
 
         boolean isReleaseAllModerateBindingsCalled() {
             return mIsReleaseAllModerateBindingsCalled;
@@ skipping 542 matching lines @@
         super.tearDown();
     }
 
     /**
      * @return the index of the given tab in the current tab model
      */
     private int indexOf(Tab tab) {
         return getActivity().getCurrentTabModel().indexOf(tab);
     }
 }