aw: Rendering test handle timeout

Follow up to last CL. Need to catch the timeout exception and retry.

Bug: 1107812
Change-Id: I03136cd8f7cb4418da2e63631020c6f7751562d1
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2332678Reviewed-by: Shimi Zhang <ctzsm@chromium.org>
Commit-Queue: Bo <boliu@chromium.org>
Cr-Commit-Position: refs/heads/master@{#793660}

android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java

@@ -37,6 +37,7 @@ import org.chromium.android_webview.renderer_priority.RendererPriority;
 import org.chromium.android_webview.test.TestAwContentsClient.OnDownloadStartHelper;
 import org.chromium.android_webview.test.util.CommonResources;
 import org.chromium.base.BuildInfo;
+import org.chromium.base.Log;
 import org.chromium.base.metrics.RecordHistogram;
 import org.chromium.base.test.util.CallbackHelper;
 import org.chromium.base.test.util.CommandLineFlags;
@@ -55,6 +56,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.concurrent.Semaphore;
 import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicInteger;
 
 /**
@@ -62,6 +64,8 @@ import java.util.concurrent.atomic.AtomicInteger;
  */
 @RunWith(AwJUnit4ClassRunner.class)
 public class AwContentsTest {
+    private static final String TAG = "AwContentsTest";
+
     @Rule
     public AwActivityTestRule mActivityTestRule = new AwActivityTestRule();
 
@@ -837,7 +841,12 @@ public class AwContentsTest {
                     callbackHelper.notifyCalled();
                 });
             });
-            callbackHelper.waitForFirst();
+            try {
+                callbackHelper.waitForFirst();
+            } catch (TimeoutException e) {
+                Log.w(TAG, "Timeout", e);
+                continue;
+            }
             int[] quadrantColors = (int[]) resultHolder[0];
             lastQuadrantColors = quadrantColors;
             if (quadrantColors != null && Color.rgb(255, 0, 0) == quadrantColors[0]