Reland of Separate deferred startup into tasks.

chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java

Index: chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java
diff --git a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java
index e52944cdab7c8aba1cde0aa19faa11e322fc9e1e..bb4fa79ca6a82c793484942d646035dae9b679af 100644
--- a/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java
+++ b/chrome/test/android/javatests/src/org/chromium/chrome/test/ChromeActivityTestCaseBase.java
@@ -464,7 +464,7 @@ public abstract class ChromeActivityTestCaseBase<T extends ChromeActivity>
         CriteriaHelper.pollUiThread(new Criteria("Deferred startup never completed") {
             @Override
             public boolean isSatisfied() {
-                return DeferredStartupHandler.getInstance().isDeferredStartupComplete();
+                return DeferredStartupHandler.getInstance().isDeferredStartupCompleteForApp();
             }
         });
 
@@ -826,7 +826,7 @@ public abstract class ChromeActivityTestCaseBase<T extends ChromeActivity>
                 final int maxIndex = Math.min(annotation.traceNames().length, Math.min(
                         annotation.graphNames().length, annotation.seriesNames().length));
 
-                List<String> allNames = new LinkedList<String>();
+                List<String> allNames = new LinkedList<>();
                 for (int i = 0; i < maxIndex; ++i) {
                     // Prune out all of ',' and ';' from the strings.  Replace them with '-'.
                     String name = annotation.traceNames()[i].replaceAll("[,;]", "-");