Hide modal permission prompts on Android upon tab navigation/destruction

chrome/android/javatests/src/org/chromium/chrome/browser/permissions/PermissionTestCaseBase.java

 // Copyright 2016 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.permissions;
 
 import android.content.DialogInterface;
 import android.support.v7.app.AlertDialog;
 import android.support.v7.widget.SwitchCompat;
 
@@ skipping 70 matching lines @@
 
         public void waitForNumUpdates(int numUpdates) throws Exception {
             mExpectedCount = numUpdates;
             mCallbackHelper.waitForCallback(0);
         }
     }
 
     /**
      * Criteria class to detect whether the permission dialog is shown.
      */
-    private static class DialogShownCriteria extends Criteria {
+    protected static class DialogShownCriteria extends Criteria {
         private AlertDialog mDialog;
+        private boolean mExpectDialog;
 
-        public DialogShownCriteria(String error) {
+        public DialogShownCriteria(String error, boolean expectDialog) {
             super(error);
+            mExpectDialog = expectDialog;
         }
 
         public AlertDialog getDialog() {
             return mDialog;
         }
 
         @Override
         public boolean isSatisfied() {
             try {
                 return ThreadUtils.runOnUiThreadBlocking(new Callable<Boolean>() {
                     @Override
                     public Boolean call() {
                         mDialog = PermissionDialogController.getInstance()
                                           .getCurrentDialogForTesting();
-                        return mDialog != null;
+                        return (mDialog != null) == mExpectDialog;
                     }
                 });
             } catch (ExecutionException e) {
                 return false;
             }
         }
     }
 
     public PermissionTestCaseBase() {
         super(ChromeActivity.class);
     }
 
     @Override
     protected void setUp() throws Exception {
         super.setUp();
         InfoBarContainer container =
                 getActivity().getTabModelSelector().getCurrentTab().getInfoBarContainer();
         mListener = new InfoBarTestAnimationListener();
         container.addAnimationListener(mListener);
         mTestServer = EmbeddedTestServer.createAndStartServer(getInstrumentation().getContext());
     }
 
     @Override
     protected void tearDown() throws Exception {
         mTestServer.stopAndDestroyServer();
         super.tearDown();
     }
 
+    protected void setUpUrl(final String url) throws InterruptedException {
+        loadUrl(mTestServer.getURL(url));
+    }
+
     /**
      * Simulates clicking a button on an AlertDialog.
      */
     private void clickButton(final AlertDialog dialog, final int button) {
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
                 dialog.getButton(button).performClick();
             }
         });
     }
 
     /**
      * Runs a permission prompt test that grants the permission and expects the page title to be
      * updated in response.
      * @param updateWaiter  The update waiter to wait for callbacks. Should be added as an observer
      *                      to the current tab prior to calling this method.
      * @param javascript    The JS function to run in the current tab to execute the test and update
      *                      the page title.
      * @param nUpdates      How many updates of the page title to wait for.
      * @param withGeature   True if we require a user gesture to trigger the prompt.
      * @param isDialog      True if we are expecting a permission dialog, false for an infobar.
      * @param hasSwitch     True if we are expecting a persistence switch, false otherwise.
      * @param toggleSwitch  True if we should toggle the switch off, false otherwise.
      * @throws Exception
      */
     protected void runAllowTest(PermissionUpdateWaiter updateWaiter, final String url,
             String javascript, int nUpdates, boolean withGesture, boolean isDialog,
             boolean hasSwitch, boolean toggleSwitch) throws Exception {
-        final String test_url = mTestServer.getURL(url);
-        loadUrl(test_url);
+        setUpUrl(url);
 
         if (withGesture) {
             runJavaScriptCodeInCurrentTab("functionToRun = '" + javascript + "'");
             singleClickView(getActivity().getActivityTab().getView());
         } else {
             runJavaScriptCodeInCurrentTab(javascript);
         }
 
         if (isDialog) {
-            DialogShownCriteria criteria = new DialogShownCriteria("Dialog not shown");
+            DialogShownCriteria criteria = new DialogShownCriteria("Dialog not shown", true);
             CriteriaHelper.pollUiThread(criteria);
             replyToDialogAndWaitForUpdates(
                     updateWaiter, criteria.getDialog(), nUpdates, true, hasSwitch, toggleSwitch);
         } else {
             replyToInfoBarAndWaitForUpdates(updateWaiter, nUpdates, true, hasSwitch, toggleSwitch);
         }
     }
 
     /**
      * Replies to an infobar permission prompt, optionally checking for the presence of a
@@ skipping 53 matching lines @@
                 }
             });
         }
     }
 
     @Override
     public void startMainActivity() throws InterruptedException {
         startMainActivityOnBlankPage();
     }
 }