Revert of Redirecting off-origin navigations in PWAs to CCT.

chrome/test/android/javatests/src/org/chromium/chrome/test/util/browser/contextmenu/ContextMenuUtils.java

 // Copyright 2013 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.test.util.browser.contextmenu;
 
 import android.app.Activity;
 import android.app.Instrumentation;
 import android.text.TextUtils;
 import android.view.ContextMenu;
@@ skipping 69 matching lines @@
 
         helper.waitForCallback(callCount);
         return helper.getContextMenu();
     }
 
     /**
      * Opens and selects an item from a context menu.
      * @param tab                   The tab to open a context menu for.
      * @param openerDOMNodeId       The DOM node to long press to open the context menu for.
      * @param itemId                The context menu item ID to select.
-     * @param activity              The activity to assert for gaining focus after click or null.
      * @throws InterruptedException
      * @throws TimeoutException
      */
     public static void selectContextMenuItem(Instrumentation instrumentation, Activity activity,
             Tab tab, String openerDOMNodeId, final int itemId)
             throws InterruptedException, TimeoutException {
         String jsCode = "document.getElementById('" + openerDOMNodeId + "')";
         selectContextMenuItemByJs(instrumentation, activity, tab, jsCode, itemId);
     }
 
     /**
      * Long presses to open and selects an item from a context menu.
      * @param tab                   The tab to open a context menu for.
      * @param jsCode                The javascript to get the DOM node to long press
      *                              to open the context menu for.
      * @param itemId                The context menu item ID to select.
-     * @param activity              The activity to assert for gaining focus after click or null.
      * @throws InterruptedException
      * @throws TimeoutException
      */
     public static void selectContextMenuItemByJs(Instrumentation instrumentation, Activity activity,
             Tab tab, String jsCode, final int itemId)
             throws InterruptedException, TimeoutException {
         ContextMenu menu = openContextMenuByJs(tab, jsCode);
         Assert.assertNotNull("Failed to open context menu", menu);
 
         selectOpenContextMenuItem(instrumentation, activity, menu, itemId);
@@ skipping 34 matching lines @@
         Assert.assertTrue("'" + itemId + "' is not enabled", item.isEnabled());
 
         instrumentation.runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 boolean activated = menu.performIdentifierAction(itemId, 0);
                 Assert.assertTrue("Failed to activate '" + itemId + "' in menu", activated);
             }
         });
 
-        if (activity != null) {
-            CriteriaHelper.pollInstrumentationThread(
-                    new Criteria("Activity did not regain focus.") {
-                        @Override
-                        public boolean isSatisfied() {
-                            return activity.hasWindowFocus();
-                        }
-                    });
-        }
+        CriteriaHelper.pollInstrumentationThread(new Criteria("Activity did not regain focus.") {
+            @Override
+            public boolean isSatisfied() {
+                return activity.hasWindowFocus();
+            }
+        });
     }
 }