Revert of Add ExecuteJavaScriptForTest and make all tests use it

content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java

Index: content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java
diff --git a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java
index d97e1ef9f72e18d4e5706d6dba25f977cfc05192..cfc53ffbfd24eb273f64cb90c52bc041ea70457b 100644
--- a/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java
+++ b/content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.java
@@ -126,7 +126,7 @@
          * @param webContents A WebContents instance to be used.
          * @param code A JavaScript code to be evaluated.
          */
-        public void evaluateJavaScriptForTests(WebContents webContents, String code) {
+        public void evaluateJavaScript(WebContents webContents, String code) {
             JavaScriptCallback callback =
                     new JavaScriptCallback() {
                     @Override
@@ -134,12 +134,12 @@
                             notifyCalled(jsonResult);
                         }
                     };
-            webContents.evaluateJavaScriptForTests(code, callback);
+            webContents.evaluateJavaScript(code, callback);
             mJsonResult = null;
         }
 
         /**
-         * Returns true if the evaluation started by evaluateJavaScriptForTests() has completed.
+         * Returns true if the evaluation started by evaluateJavaScript() has completed.
          */
         public boolean hasValue() {
             return mJsonResult != null;