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

chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionTest.java

Index: chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionTest.java
diff --git a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionTest.java b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionTest.java
index 503975dd7ccf817c29833d722ea1828f4d04231a..c14c9a96c685e2f7eaa44133ab357332420fdf9e 100644
--- a/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionTest.java
+++ b/chrome/android/javatests/src/org/chromium/chrome/browser/customtabs/CustomTabsConnectionTest.java
@@ -23,6 +23,7 @@ import org.chromium.base.ThreadUtils;
 import org.chromium.base.library_loader.LibraryLoader;
 import org.chromium.base.library_loader.LibraryProcessType;
 import org.chromium.base.test.util.Restriction;
+import org.chromium.chrome.browser.WarmupManager;
 import org.chromium.chrome.browser.preferences.PrefServiceBridge;
 import org.chromium.content_public.browser.WebContents;
 
@@ -57,6 +58,12 @@ public class CustomTabsConnectionTest extends InstrumentationTestCase {
     protected void tearDown() throws Exception {
         super.tearDown();
         CustomTabsTestUtils.cleanupSessions(mCustomTabsConnection);
+        ThreadUtils.runOnUiThreadBlocking(new Runnable() {
+            @Override
+            public void run() {
+                WarmupManager.getInstance().destroySpareWebContents();
+            }
+        });
     }
 
     /**
@@ -102,8 +109,12 @@ public class CustomTabsConnectionTest extends InstrumentationTestCase {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                assertNotNull(mCustomTabsConnection.takeSpareWebContents());
-                assertNull(mCustomTabsConnection.takeSpareWebContents());
+                WarmupManager warmupManager = WarmupManager.getInstance();
+                assertTrue(warmupManager.hasSpareWebContents());
+                WebContents webContents = warmupManager.takeSpareWebContents(false, false);
+                assertNotNull(webContents);
+                assertFalse(warmupManager.hasSpareWebContents());
+                webContents.destroy();
             }
         });
     }
@@ -116,7 +127,7 @@ public class CustomTabsConnectionTest extends InstrumentationTestCase {
             @Override
             public void run() {
                 assertSpareWebContentsNotNullAndDestroy();
-                assertNull(mCustomTabsConnection.takeSpareWebContents());
+                assertFalse(WarmupManager.getInstance().hasSpareWebContents());
             }
         });
         assertTrue(mCustomTabsConnection.warmup(0));
@@ -135,7 +146,7 @@ public class CustomTabsConnectionTest extends InstrumentationTestCase {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                assertNull(mCustomTabsConnection.takeSpareWebContents());
+                assertFalse(WarmupManager.getInstance().hasSpareWebContents());
                 String referrer =
                         mCustomTabsConnection.getReferrerForSession(token).getUrl();
                 WebContents webContents =
@@ -284,7 +295,7 @@ public class CustomTabsConnectionTest extends InstrumentationTestCase {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                assertNull(mCustomTabsConnection.takeSpareWebContents());
+                assertNull(WarmupManager.getInstance().takeSpareWebContents(false, false));
                 String referrer = mCustomTabsConnection.getReferrerForSession(token).getUrl();
                 assertNotNull(mCustomTabsConnection.takePrerenderedUrl(token, URL, referrer));
             }
@@ -298,7 +309,7 @@ public class CustomTabsConnectionTest extends InstrumentationTestCase {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                assertNull(mCustomTabsConnection.takeSpareWebContents());
+                assertNull(WarmupManager.getInstance().takeSpareWebContents(false, false));
             }
         });
         assertTrue(mCustomTabsConnection.mayLaunchUrl(token, null, null, null));
@@ -313,7 +324,7 @@ public class CustomTabsConnectionTest extends InstrumentationTestCase {
     }
 
     private void assertSpareWebContentsNotNullAndDestroy() {
-        WebContents webContents = mCustomTabsConnection.takeSpareWebContents();
+        WebContents webContents = WarmupManager.getInstance().takeSpareWebContents(false, false);
         assertNotNull(webContents);
         webContents.destroy();
     }
@@ -517,7 +528,7 @@ public class CustomTabsConnectionTest extends InstrumentationTestCase {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                assertNull(mCustomTabsConnection.takeSpareWebContents());
+                assertNull(WarmupManager.getInstance().takeSpareWebContents(false, false));
                 String referrer = mCustomTabsConnection.getReferrerForSession(token).getUrl();
                 WebContents prerender = mCustomTabsConnection.takePrerenderedUrl(
                         token, URL, referrer);