Revert of Android: Make the spare renderer accessible to all Chrome tabs.

chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabActivityTest.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.customtabs;
 
 import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_NON_LOW_END_DEVICE;
 
 import android.app.Activity;
 import android.app.Application;
@@ skipping 1074 matching lines @@
         Context context = getInstrumentation().getTargetContext().getApplicationContext();
         final CustomTabsConnection connection = warmUpAndWait();
         CustomTabsSessionToken token = CustomTabsSessionToken.createDummySessionTokenForTesting();
         connection.newSession(token);
         try {
             startCustomTabActivityWithIntent(
                     CustomTabsTestUtils.createMinimalCustomTabIntent(context, mTestPage));
         } catch (InterruptedException e) {
             fail();
         }
-        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
-            @Override
-            public void run() {
-                assertFalse("Warmup() should have allocated a child connection",
-                        mActivity.shouldAllocateChildConnection());
-            }
-        });
+        assertFalse(
+                "Warmup() should have allocated a child connection",
+                mActivity.shouldAllocateChildConnection());
     }
 
     /**
      * Tests that the activity knows there is no child process.
      */
     @SmallTest
     @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
     public void testAllocateChildConnectionNoWarmup() throws Exception {
         Context context = getInstrumentation().getTargetContext().getApplicationContext();
         final CustomTabsConnection connection =
                 CustomTabsConnection.getInstance((Application) context);
         CustomTabsSessionToken token = CustomTabsSessionToken.createDummySessionTokenForTesting();
         connection.newSession(token);
 
         try {
             startCustomTabActivityWithIntent(
                     CustomTabsTestUtils.createMinimalCustomTabIntent(context, mTestPage2));
         } catch (InterruptedException e) {
             fail();
         }
-        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
-            @Override
-            public void run() {
-                assertTrue("No spare renderer available, should allocate a child connection.",
-                        mActivity.shouldAllocateChildConnection());
-            }
-        });
+        assertTrue(
+                "No spare renderer available, should allocate a child connection.",
+                mActivity.shouldAllocateChildConnection());
     }
 
     /**
      * Tests that the activity knows there is already a child process when prerendering.
      */
     @SmallTest
     @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
     public void testAllocateChildConnectionWithPrerender() throws Exception {
         Context context = getInstrumentation().getTargetContext().getApplicationContext();
         final CustomTabsConnection connection = warmUpAndWait();
         CustomTabsSessionToken token = CustomTabsSessionToken.createDummySessionTokenForTesting();
         connection.newSession(token);
         assertTrue(connection.mayLaunchUrl(token, Uri.parse(mTestPage), null, null));
         try {
             startCustomTabActivityWithIntent(
                     CustomTabsTestUtils.createMinimalCustomTabIntent(context, mTestPage));
         } catch (InterruptedException e) {
             fail();
         }
-        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
-            @Override
-            public void run() {
-                assertFalse("Prerendering should have allocated a child connection",
-                        mActivity.shouldAllocateChildConnection());
-            }
-        });
+        assertFalse(
+                "Prerendering should have allocated a child connection",
+                mActivity.shouldAllocateChildConnection());
     }
 
     /**
      * Tests that prerendering accepts a referrer, and that this is not lost when launching the
      * Custom Tab.
      */
     @SmallTest
     @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
     public void testPrerenderingWithReferrer() throws Exception {
         String referrer = "android-app://com.foo.me/";
@@ skipping 379 matching lines @@
                 if (jsonText.equalsIgnoreCase("null")) jsonText = "";
                 value = jsonText;
             } catch (InterruptedException | TimeoutException e) {
                 e.printStackTrace();
                 return false;
             }
             return TextUtils.equals(mExpected, value);
         }
     }
 }