Index: chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java |
diff --git a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java |
index 01e9ff142c75b0063ed8f3d0f104853e01c11cd4..c9848c05e57749199470d720baa2a8ea4aeae581 100644 |
--- a/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java |
+++ b/chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabsConnection.java |
@@ -689,10 +689,6 @@ public class CustomTabsConnection { |
private boolean prerenderUrl( |
CustomTabsSessionToken session, String url, Bundle extras, int uid) { |
ThreadUtils.assertOnUiThread(); |
- // TODO(lizeb): Prerendering through ChromePrerenderService is |
- // incompatible with prerendering through this service. Remove this |
- // limitation, or remove ChromePrerenderService. |
- WarmupManager.getInstance().disallowPrerendering(); |
// Ignores mayPrerender() for an empty URL, since it cancels an existing prerender. |
if (!mayPrerender(session) && !TextUtils.isEmpty(url)) return false; |
if (!mWarmupHasBeenCalled.get()) return false; |