Catch InterruptedException in CriteriaHelper

chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/TypedUrlsTest.java

Index: chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/TypedUrlsTest.java
diff --git a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/TypedUrlsTest.java b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/TypedUrlsTest.java
index 9fce84d1d0cb0609bdb8d89036f3393e7192d75b..7e1f403e2768da10768d58bb55d34c1712fb20e8 100644
--- a/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/TypedUrlsTest.java
+++ b/chrome/android/sync_shell/javatests/src/org/chromium/chrome/browser/sync/TypedUrlsTest.java
@@ -7,6 +7,9 @@ package org.chromium.chrome.browser.sync;
 import android.test.suitebuilder.annotation.LargeTest;
 import android.util.Pair;
 
+import org.json.JSONException;
+import org.json.JSONObject;
+
 import org.chromium.base.ThreadUtils;
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.RetryOnFailure;
@@ -19,8 +22,6 @@ import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.ui.base.PageTransition;
-import org.json.JSONException;
-import org.json.JSONObject;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -63,7 +64,7 @@ public class TypedUrlsTest extends SyncTestBase {
     // Test syncing a typed URL from client to server.
     @LargeTest
     @Feature({"Sync"})
-    public void testUploadTypedUrl() throws Exception {
+    public void testUploadTypedUrl() {
         loadUrlByTyping(URL);
         waitForClientTypedUrlCount(1);
         waitForServerTypedUrlCountWithName(1, URL);
@@ -143,7 +144,7 @@ public class TypedUrlsTest extends SyncTestBase {
                         count, ModelType.TYPED_URLS, name));
     }
 
-    private void waitForClientTypedUrlCount(int count) throws InterruptedException {
+    private void waitForClientTypedUrlCount(int count) {
         CriteriaHelper.pollInstrumentationThread(Criteria.equals(count, new Callable<Integer>() {
             @Override
             public Integer call() throws Exception {
@@ -152,8 +153,7 @@ public class TypedUrlsTest extends SyncTestBase {
         }), SyncTestUtil.TIMEOUT_MS, SyncTestUtil.INTERVAL_MS);
     }
 
-    private void waitForServerTypedUrlCountWithName(final int count, final String name)
-            throws InterruptedException {
+    private void waitForServerTypedUrlCountWithName(final int count, final String name) {
         CriteriaHelper.pollInstrumentationThread(new Criteria(
                 "Expected " + count + " server typed URLs with name " + name + ".") {
             @Override