Unflake CustomTabTests

chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTestBase.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTestBase.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTestBase.java b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTestBase.java
index 9cf17bd47a6496355302a3cb252eb28aaf469b89..1ef5dd44815ec9577f63431d87a57c318e974a44 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTestBase.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTestBase.java
@@ -67,7 +67,7 @@ public abstract class CustomTabActivityTestBase extends
             }
         });
         try {
-            pageLoadFinishedHelper.waitForCallback(0);
+            if (!tab.isLoadingAndRenderingDone()) pageLoadFinishedHelper.waitForCallback(0);

[Ian Wen, 2015/08/11 22:28:59]

Does this mean our loading is too fast and by this line the loading has already
finished?

[Yusuf, 2015/08/11 22:31:22]

yes. usually about:blank is pretty fast :)

         } catch (TimeoutException e) {
             fail();
         }