Increase timeout in WebappActivityTestBase.waitUntilIdle

This change increases the timeout in
WebappActivityTestBase.waitUntilIdle and re-enables one test
that was failing on M testers due to a too short timeout.

BUG=614338

Review-Url: https://codereview.chromium.org/2108913002
Cr-Commit-Position: refs/heads/master@{#402678}

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappActivityTestBase.java

@@ -4,6 +4,8 @@
 
 package org.chromium.chrome.browser.webapps;
 
+import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout;
+
 import android.content.Intent;
 import android.net.Uri;
 import android.view.ViewGroup;
@@ -29,6 +31,8 @@ public abstract class WebappActivityTestBase extends ChromeActivityTestCaseBase<
     static final String WEBAPP_NAME = "webapp name";
     static final String WEBAPP_SHORT_NAME = "webapp short name";
 
+    private static final long STARTUP_TIMEOUT = scaleTimeout(10000);
+
     // Empty 192x192 image generated with:
     // ShortcutHelper.encodeBitmapAsString(Bitmap.createBitmap(192, 192, Bitmap.Config.ARGB_4444));
     protected static final String TEST_ICON =
@@ -139,7 +143,7 @@ public abstract class WebappActivityTestBase extends ChromeActivityTestCaseBase<
                         return getActivity().getActivityTab() != null
                                 && !getActivity().getActivityTab().isLoading();
                     }
-                });
+                }, STARTUP_TIMEOUT, CriteriaHelper.DEFAULT_POLLING_INTERVAL);
         } catch (InterruptedException exception) {
             fail();
         }

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappUrlBarTest.java

@@ -8,7 +8,6 @@ import android.content.Intent;
 import android.test.UiThreadTest;
 import android.test.suitebuilder.annotation.MediumTest;
 
-import org.chromium.base.test.util.DisableIf;
 import org.chromium.base.test.util.Feature;
 import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.components.security_state.ConnectionSecurityLevel;
@@ -37,7 +36,6 @@ public class WebappUrlBarTest extends WebappActivityTestBase {
     @UiThreadTest
     @MediumTest
     @Feature({"Webapps"})
-    @DisableIf.Build(sdk_is_greater_than = 22, message = "crbug.com/614338")
     public void testUrlDisplay() {
         final String scheme = "https://";
         final String host = "lorem.com";