Close CCT when X button is pressed if dynamic module has not been loaded

because of failure.

Bug: 908484
Change-Id: I19d7c285f679bcce3a25b06c883f978b5c4e95cb
Reviewed-on: https://chromium-review.googlesource.com/c/1350978
Commit-Queue: Anna Malova <amalova@chromium.org>
Reviewed-by: Peter Conn <peconn@chromium.org>
Reviewed-by: Michael van Ouwerkerk <mvanouwerkerk@chromium.org>
Cr-Commit-Position: refs/heads/master@{#611119}

chrome/android/java/src/org/chromium/chrome/browser/customtabs/CustomTabActivity.java

@@ -345,11 +345,16 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
         mModuleCallback = new LoadModuleCallback();
         moduleLoader.addCallbackAndIncrementUseCount(mModuleCallback);
 
-        getComponent().resolveCloseButtonNavigator()
-                .setLandingPageCriteria(this::isModuleManagedUrl);
+        getComponent().resolveCloseButtonNavigator().setLandingPageCriteria(url ->
+                (isModuleLoading() || isModuleLoaded()) && isModuleManagedUrl(url));
     }
 
-    private boolean isModuleLoading() {
+    private boolean isModuleLoaded() {
+        return mModuleActivityDelegate != null;
+    }
+
+    @VisibleForTesting
+    public boolean isModuleLoading() {
         return mModuleCallback != null;
     }
 
@@ -360,6 +365,8 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
     private class LoadModuleCallback implements Callback<ModuleEntryPoint> {
         @Override
         public void onResult(@Nullable ModuleEntryPoint entryPoint) {
+            mModuleCallback = null;
+
             if (entryPoint == null) return;
 
             mModuleEntryPoint = entryPoint;
@@ -375,7 +382,6 @@ public class CustomTabActivity extends ChromeActivity<CustomTabActivityComponent
 
             mConnection.setActivityDelegateForSession(mSession, mModuleActivityDelegate,
                     mModuleEntryPoint.getModuleVersion());
-            mModuleCallback = null;
 
             // Initialise the PostMessageHandler for the current web contents.
             maybeInitialiseDynamicModulePostMessageHandler(

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

@@ -1238,6 +1238,49 @@ public class CustomTabActivityTest {
                 ClickUtils.clickButton(cctActivity.findViewById(R.id.close_button)));
     }
 
+    /**
+     This test executes the following workflow assuming dynamic module loading fails:
+     - moduleManagedUrl1 -> nav1.1 - nav1.2
+     - User hits the close button, thereby closes CCT
+     */
+    @Test
+    @SmallTest
+    public void testCloseButtonBehaviourDynamicModuleLoadFails()
+            throws InterruptedException, ExecutionException, TimeoutException {
+        String moduleManagedUrl = mTestServer.getURL(
+                "/chrome/test/data/android/about.html");
+
+        // Open CCT with moduleManagedUrl1 and navigate
+        // moduleManagedUrl1 -> nav1.1 - nav1.2
+
+        // Make an intent with nonexistent class name so module loading fails.
+        ComponentName componentName =
+                new ComponentName(CustomTabsDynamicModuleTestUtils.FAKE_MODULE_PACKAGE_NAME,
+                        "ClassName");
+        Intent intent = CustomTabsDynamicModuleTestUtils.makeDynamicModuleIntent(
+                componentName, moduleManagedUrl, "^" + moduleManagedUrl+ "$");
+
+        mCustomTabActivityTestRule.startCustomTabActivityWithIntent(intent);
+        CustomTabActivity cctActivity = mCustomTabActivityTestRule.getActivity();
+
+        // Wait until ModuleLoader tries to load a module.
+        CriteriaHelper.pollUiThread(new Criteria() {
+            @Override
+            public boolean isSatisfied() {
+                return !cctActivity.isModuleLoading();
+            }
+        });
+
+        mCustomTabActivityTestRule.loadUrlInTab(mTestPage, PageTransition.LINK,
+                cctActivity.getActivityTab());
+        mCustomTabActivityTestRule.loadUrlInTab(mTestPage2, PageTransition.LINK,
+                cctActivity.getActivityTab());
+
+        // click close button and wait while cct is hidden
+        runAndWaitForActivityStopped(() ->
+                ClickUtils.clickButton(cctActivity.findViewById(R.id.close_button)));
+    }
+
     @Test
     @SmallTest
     @RetryOnFailure

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

@@ -155,13 +155,24 @@ public class CustomTabsDynamicModuleTestUtils {
 
     /**
      * Creates the simplest intent that is sufficient to let {@link ChromeLauncherActivity} launch
-     * the {@link CustomTabActivity} with dynamic module.
+     * the {@link CustomTabActivity} with fake dynamic module.
+     *
+     * @see #makeDynamicModuleIntent(ComponentName, String, String)
      */
     public static Intent makeDynamicModuleIntent(String url, @Nullable String managedUrlsRegex) {
+        return makeDynamicModuleIntent(FAKE_MODULE_COMPONENT_NAME, url, managedUrlsRegex);
+    }
+
+    /**
+     * Creates the simplest intent that is sufficient to let {@link ChromeLauncherActivity} launch
+     * the {@link CustomTabActivity} with dynamic module.
+     */
+    public static Intent makeDynamicModuleIntent(
+            ComponentName componentName, String url, @Nullable String managedUrlsRegex) {
         Intent intent = CustomTabsTestUtils.createMinimalCustomTabIntent(
                 InstrumentationRegistry.getTargetContext(), url);
-        intent.putExtra(EXTRA_MODULE_PACKAGE_NAME, FAKE_MODULE_PACKAGE_NAME);
-        intent.putExtra(EXTRA_MODULE_CLASS_NAME, FAKE_MODULE_CLASS_NAME);
+        intent.putExtra(EXTRA_MODULE_PACKAGE_NAME, componentName.getPackageName());
+        intent.putExtra(EXTRA_MODULE_CLASS_NAME, componentName.getClassName());
 
         if (managedUrlsRegex != null) {
             intent.putExtra(CustomTabIntentDataProvider.EXTRA_MODULE_MANAGED_URLS_REGEX,