Revert "Separate deferred startup into tasks."

chrome/android/javatests/src/org/chromium/chrome/browser/widget/ToolbarProgressBarTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/widget/ToolbarProgressBarTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/widget/ToolbarProgressBarTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/widget/ToolbarProgressBarTest.java
index f7d3bd9cef9c9a1c99936139d10f3cce47c96218..6ff7bd7401c2ccbdf5f49715108335782b29f45b 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/widget/ToolbarProgressBarTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/widget/ToolbarProgressBarTest.java
@@ -17,8 +17,6 @@ import org.chromium.chrome.R;
 import org.chromium.chrome.browser.ChromeTabbedActivity;
 import org.chromium.chrome.test.ChromeActivityTestCaseBase;
 import org.chromium.chrome.test.util.ChromeRestriction;
-import org.chromium.content.browser.test.util.Criteria;
-import org.chromium.content.browser.test.util.CriteriaHelper;
 import org.chromium.content.browser.test.util.JavaScriptUtils;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPageFinishedHelper;
 import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPageStartedHelper;
@@ -118,7 +116,7 @@ public class ToolbarProgressBarTest extends ChromeActivityTestCaseBase<ChromeTab
         final Object onAnimationEnd = new Object();
         final AtomicBoolean animationEnded = new AtomicBoolean(false);
         final AtomicReference<ToolbarProgressBar> progressBar =
-                new AtomicReference<>();
+                new AtomicReference<ToolbarProgressBar>();
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
@@ -149,12 +147,8 @@ public class ToolbarProgressBarTest extends ChromeActivityTestCaseBase<ChromeTab
             }
         });
 
-        CriteriaHelper.pollUiThread(new Criteria("Progress bar not hidden at start") {
-            @Override
-            public boolean isSatisfied() {
-                return progressBar.get().getVisibility() == View.INVISIBLE;
-            }
-        });
+        // Before the actual test, ensure that the progress bar is hidden.
+        assertNotSame(View.VISIBLE, progressBar.get().getVisibility());
 
         // Make some progress and check that the progress bar is fully visible.
         animationEnded.set(false);