Revert of Add ExecuteJavaScriptForTest and make all tests use it

chrome/android/javatests/src/org/chromium/chrome/browser/ModalDialogTest.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.browser;
 
 import android.content.DialogInterface;
 import android.support.v7.app.AlertDialog;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.util.Log;
@@ skipping 246 matching lines @@
                     return "Suppress checkbox is not visible.";
                 }
                 suppress.setChecked(true);
                 return null;
             }
         });
         assertNull(errorMessage, errorMessage);
         clickCancel(jsDialog);
         scriptEvent.waitUntilHasValue();
 
-        scriptEvent.evaluateJavaScriptForTests(
-                getActivity().getCurrentContentViewCore().getWebContents(),
+        scriptEvent.evaluateJavaScript(getActivity().getCurrentContentViewCore().getWebContents(),
                 "alert('Android');");
         assertTrue("No further dialog boxes should be shown.", scriptEvent.waitUntilHasValue());
     }
 
     /**
      * Displays a dialog and closes the tab in the background before attempting
      * to accept the dialog. Verifies that the dialog is dismissed when the tab
      * is closed.
      */
     @MediumTest
@@ skipping 25 matching lines @@
         return executeJavaScriptAndWaitForDialog(new OnEvaluateJavaScriptResultHelper(), script);
     }
 
     /**
      * Given a JavaScript evaluation helper, asynchronously executes the given
      * code for spawning a dialog and waits for the dialog to be visible.
      */
     private OnEvaluateJavaScriptResultHelper executeJavaScriptAndWaitForDialog(
             final OnEvaluateJavaScriptResultHelper helper, String script)
             throws InterruptedException {
-        helper.evaluateJavaScriptForTests(
-                getActivity().getCurrentContentViewCore().getWebContents(),
+        helper.evaluateJavaScript(getActivity().getCurrentContentViewCore().getWebContents(),
                 script);
         boolean criteriaSatisfied = CriteriaHelper.pollForCriteria(
                 new JavascriptAppModalDialogShownCriteria(true));
         assertTrue("Could not spawn or locate a modal dialog.", criteriaSatisfied);
         return helper;
     }
 
     /**
      * Returns an array of the 3 buttons for this dialog, in the order
      * BUTTON_NEGATIVE, BUTTON_NEUTRAL and BUTTON_POSITIVE. Any of these values
@@ skipping 84 matching lines @@
                 button.getVisibility());
         assertEquals("'" + readableName + "' button has wrong text",
                 getActivity().getResources().getString(expectedTextResourceId),
                 button.getText().toString());
     }
 
     private TestCallbackHelperContainer getActiveTabTestCallbackHelperContainer() {
         return new TestCallbackHelperContainer(getActivity().getCurrentContentViewCore());
     }
 }