CustomTabs: Base version for prerender switch

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 145 matching lines @@
         mTestServer = EmbeddedTestServer.createAndStartServer(appContext);
         mTestPage = mTestServer.getURL(TEST_PAGE);
         mTestPage2 = mTestServer.getURL(TEST_PAGE_2);
         PathUtils.setPrivateDataDirectorySuffix(PRIVATE_DATA_DIRECTORY_SUFFIX);
         LibraryLoader.get(LibraryProcessType.PROCESS_BROWSER).ensureInitialized();
         mWebServer = TestWebServer.start();
 
         CustomTabsConnection connection =
                 CustomTabsConnection.getInstance((Application) appContext);
         connection.setForcePrerender(true);
+        connection.setPrerenderMode(CustomTabsConnection.DEFAULT_PRERENDER);
     }
 
     @Override
     protected void tearDown() throws Exception {
         Context appContext = getInstrumentation().getTargetContext().getApplicationContext();
         CustomTabsConnection connection =
                 CustomTabsConnection.getInstance((Application) appContext);
         connection.setForcePrerender(false);
 
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
@@ skipping 1301 matching lines @@
      */
     @SmallTest
     @RetryOnFailure
     public void testPrecreatedRenderer() throws InterruptedException {
         CustomTabsConnection connection = warmUpAndWait();
         Context context = getInstrumentation().getTargetContext();
         Intent intent = CustomTabsTestUtils.createMinimalCustomTabIntent(context, mTestPage);
         CustomTabsSessionToken token = CustomTabsSessionToken.getSessionTokenFromIntent(intent);
         assertTrue(connection.newSession(token));
         Bundle extras = new Bundle();
+        // Forcing no prerendering implies falling back to simply creating a spare WebContent

[ahemery, 2017/03/16 17:28:35]

Unrelated comment to help readability

         extras.putInt(
                 CustomTabsConnection.DEBUG_OVERRIDE_KEY, CustomTabsConnection.NO_PRERENDERING);
         assertTrue(connection.mayLaunchUrl(token, Uri.parse(mTestPage), extras, null));
         try {
             startCustomTabActivityWithIntent(intent);
         } catch (InterruptedException e) {
             fail();
         }
         CriteriaHelper.pollInstrumentationThread(new Criteria() {
             @Override
@@ skipping 133 matching lines @@
 
         if (wait) ensureCompletedPrerenderForUrl(connection, initialUrl);
 
         try {
             startCustomTabActivityWithIntent(intent);
         } catch (InterruptedException e) {
             fail();
         }
         final Tab tab = mActivity.getActivityTab();
         ElementContentCriteria initialVisibilityCriteria = new ElementContentCriteria(
-                tab, "visibility", ignoreFragments ? "prerender" : "visible");
+                tab, "visibility", ignoreFragments ? getBaseExpectedVisibility() : "visible");

[ahemery, 2017/03/16 17:28:35]

Since prerender visibility is prerender and hidden tab is hidden I introduced a
function to deal with this transparently in tests.

         ElementContentCriteria initialFragmentCriteria = new ElementContentCriteria(
                 tab, "initial-fragment", ignoreFragments ? initialFragment : fragment);
         ElementContentCriteria fragmentCriteria = new ElementContentCriteria(
                 tab, "fragment", fragment);
 
         if (wait) {
             // The tab hasn't been reloaded.
             CriteriaHelper.pollInstrumentationThread(initialVisibilityCriteria, 2000, 200);
             // No reload (initial fragment is correct).
             CriteriaHelper.pollInstrumentationThread(initialFragmentCriteria, 2000, 200);
@@ skipping 455 matching lines @@
     }
 
     private CustomTabsSessionToken warmUpAndLaunchUrlWithSession() throws InterruptedException {
         return warmUpAndLaunchUrlWithSession(
                 CustomTabsTestUtils.createMinimalCustomTabIntent(
                         getInstrumentation().getTargetContext(), mTestPage));
     }
 
     private static void ensureCompletedPrerenderForUrl(
             final CustomTabsConnection connection, final String url) throws Exception {
-        CriteriaHelper.pollUiThread(new Criteria("No Prerender") {
-            @Override
-            public boolean isSatisfied() {
-                return connection.mSpeculation != null
-                        && connection.mSpeculation.webContents != null
-                        && ExternalPrerenderHandler.hasPrerenderedAndFinishedLoadingUrl(
-                                   Profile.getLastUsedProfile(), url,
-                                   connection.mSpeculation.webContents);
-            }
-        }, LONG_TIMEOUT_MS, CriteriaHelper.DEFAULT_POLLING_INTERVAL);
+        if (connection.mPrerenderMode == CustomTabsConnection.DEFAULT_PRERENDER) {
+            CriteriaHelper.pollUiThread(new Criteria("No Prerender") {
+                @Override
+                public boolean isSatisfied() {
+                    return connection.mSpeculation != null
+                            && connection.mSpeculation.webContents != null
+                            && ExternalPrerenderHandler.hasPrerenderedAndFinishedLoadingUrl(
+                                       Profile.getLastUsedProfile(), url,
+                                       connection.mSpeculation.webContents);
+                }
+            }, LONG_TIMEOUT_MS, CriteriaHelper.DEFAULT_POLLING_INTERVAL);
+        }
     }
 
     private CustomTabsSession bindWithCallback(final CustomTabsCallback callback) {
         final AtomicReference<CustomTabsSession> sessionReference = new AtomicReference<>(null);
         CustomTabsClient.bindCustomTabsService(getInstrumentation().getContext(),
                 getInstrumentation().getTargetContext().getPackageName(),
                 new CustomTabsServiceConnection() {
                     @Override
                     public void onServiceDisconnected(ComponentName name) {}
 
@@ skipping 67 matching lines @@
                         mTab.getWebContents(), mJsFunction);
                 if (jsonText.equalsIgnoreCase("null")) jsonText = "";
                 value = jsonText;
             } catch (InterruptedException | TimeoutException e) {
                 e.printStackTrace();
                 return false;
             }
             return TextUtils.equals(mExpected, value);
         }
     }
+
+    private String getBaseExpectedVisibility() {
+        final Context context = getInstrumentation().getTargetContext().getApplicationContext();
+        CustomTabsConnection connection = CustomTabsConnection.getInstance((Application) context);
+        return getExpectedVisibilityForMode(connection.mPrerenderMode);
+    }
+
+    private static String getExpectedVisibilityForMode(int mode) {
+        switch (mode) {
+            case CustomTabsConnection.DEFAULT_PRERENDER:
+                return "prerender";
+            default:
+                return "visible";
+        }
+    }
 }