Increase timeout in WebappActivityTestBase.waitUntilIdle

chrome/android/javatests/src/org/chromium/chrome/browser/webapps/WebappActivityTestBase.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.webapps;
 
+import static org.chromium.base.test.util.ScalableTimeout.scaleTimeout;
+
 import android.content.Intent;
 import android.net.Uri;
 import android.view.ViewGroup;
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.chrome.browser.ShortcutHelper;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.content.browser.test.util.CallbackHelper;
 import org.chromium.content.browser.test.util.Criteria;
 import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.TestWebContentsObserver;
 import org.chromium.content_public.browser.LoadUrlParams;
 import org.chromium.ui.base.PageTransition;
 
 import java.util.concurrent.TimeoutException;
 
 /**
  * The base class of the WebappActivity tests. It provides the common methods to access the activity
  * UI.  This particular test base only instantiates WebappActivity0.
  */
 public abstract class WebappActivityTestBase extends ChromeActivityTestCaseBase<WebappActivity0> {
     static final String WEBAPP_ID = "webapp_id";
     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 =
             "iVBORw0KGgoAAAANSUhEUgAAAMAAAADACAYAAABS3GwHAAAABHNCSVQICAgIfAhkiAAAAKZJREFU"
             + "eJztwTEBAAAAwqD1T20JT6AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
             + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA"
             + "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAD4GQN4AAe3mX6IA"
             + "AAAASUVORK5CYII=";
 
     // Empty 512x512 image generated with:
@@ skipping 90 matching lines @@
      */
     protected void waitUntilIdle() {
         getInstrumentation().waitForIdleSync();
         try {
             CriteriaHelper.pollInstrumentationThread(new Criteria() {
                     @Override
                     public boolean isSatisfied() {
                         return getActivity().getActivityTab() != null
                                 && !getActivity().getActivityTab().isLoading();
                     }
-                });
+                }, STARTUP_TIMEOUT, CriteriaHelper.DEFAULT_POLLING_INTERVAL);
         } catch (InterruptedException exception) {
             fail();
         }
 
         getInstrumentation().waitForIdleSync();
     }
 
     /**
      * Loads the URL in the WebappActivity and waits until it has been fully loaded.
      * @param url URL to load.
@@ skipping 59 matching lines @@
             fail();
         }
 
         ViewGroup splashScreen = getActivity().getSplashScreenForTests();
         if (splashScreen == null) {
             fail("No splash screen available.");
         }
         return splashScreen;
     }
 }