Revert of Add ExecuteJavaScriptForTest and make all tests use it

chrome/android/javatests/src/org/chromium/chrome/browser/TabsTest.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;
 
 import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_NON_LOW_END_DEVICE;
 import static org.chromium.base.test.util.Restriction.RESTRICTION_TYPE_PHONE;
 
 import android.content.DialogInterface;
@@ skipping 115 matching lines @@
     @Restriction(RESTRICTION_TYPE_NON_LOW_END_DEVICE)
     public void testSpawnPopupOnBackgroundTab() throws InterruptedException, TimeoutException {
         loadUrl(UrlUtils.getIsolatedTestFileUrl(TEST_FILE_PATH));
         final Tab tab = getActivity().getActivityTab();
 
         newIncognitoTabFromMenu();
 
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                tab.getWebContents().evaluateJavaScriptForTests(
+                tab.getWebContents().evaluateJavaScript(
                         "(function() {"
                         + "  window.open('www.google.com');"
                         + "})()",
                         null);
             }
         });
 
         assertTrue("Tab never spawned in normal model.",
                 CriteriaHelper.pollForUIThreadCriteria(new Criteria() {
                     @Override
                     public boolean isSatisfied() {
                         return getActivity().getTabModelSelector().getModel(false).getCount() == 2;
                     }
                 }));
     }
 
     @MediumTest
     public void testAlertDialogDoesNotChangeActiveModel() throws InterruptedException {
         newIncognitoTabFromMenu();
         loadUrl(UrlUtils.getIsolatedTestFileUrl(TEST_FILE_PATH));
         final Tab tab = getActivity().getActivityTab();
         ThreadUtils.runOnUiThreadBlocking(new Runnable() {
             @Override
             public void run() {
-                tab.getWebContents().evaluateJavaScriptForTests(
+                tab.getWebContents().evaluateJavaScript(
                         "(function() {"
                         + "  alert('hi');"
                         + "})()",
                         null);
             }
         });
 
         final AtomicReference<JavascriptAppModalDialog> dialog =
                 new AtomicReference<JavascriptAppModalDialog>();
 
@@ skipping 1483 matching lines @@
                 || getName().equals("testTabsAreDestroyedOnModelDestruction")) {
             return;
         }
 
         if (getName().equals("testSpawnPopupOnBackgroundTab")) {
             CommandLine.getInstance().appendSwitch(ContentSwitches.DISABLE_POPUP_BLOCKING);
         }
         startMainActivityFromLauncher();
     }
 }