Revert of Add ExecuteJavaScriptForTest and make all tests use it

android_webview/javatests/src/org/chromium/android_webview/test/util/JSUtils.java

 // Copyright 2012 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.android_webview.test.util;
 
 import android.test.InstrumentationTestCase;
 
 import junit.framework.Assert;
 
@@ skipping 29 matching lines @@
                     t.printStackTrace();
                     Assert.fail("Failed to check if DOM is loaded: " + t.toString());
                     return false;
                 }
             }
         }, WAIT_TIMEOUT_MS, CHECK_INTERVAL));
 
         testCase.getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
-                awContents.getWebContents().evaluateJavaScriptForTests(
+                awContents.getWebContents().evaluateJavaScript(
                         "var evObj = document.createEvent('Events'); "
                                 + "evObj.initEvent('click', true, false); "
                                 + "document.getElementById('" + linkId + "').dispatchEvent(evObj);"
                                 + "console.log('element with id [" + linkId + "] clicked');",
                         null);
             }
         });
     }
 
     public static String executeJavaScriptAndWaitForResult(
             InstrumentationTestCase testCase,
             final AwContents awContents,
             final OnEvaluateJavaScriptResultHelper onEvaluateJavaScriptResultHelper,
             final String code) throws Exception {
         testCase.getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
-                onEvaluateJavaScriptResultHelper.evaluateJavaScriptForTests(
+                onEvaluateJavaScriptResultHelper.evaluateJavaScript(
                         awContents.getWebContents(), code);
             }
         });
         onEvaluateJavaScriptResultHelper.waitUntilHasValue();
         Assert.assertTrue("Failed to retrieve JavaScript evaluation results.",
                 onEvaluateJavaScriptResultHelper.hasValue());
         return onEvaluateJavaScriptResultHelper.getJsonResultAndClear();
     }
 }