Revert of Add ExecuteJavaScriptForTest and make all tests use it

content/public/test/android/javatests/src/org/chromium/content/browser/test/util/TestCallbackHelperContainer.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.content.browser.test.util;
 
 
 import org.chromium.base.ThreadUtils;
 import org.chromium.content.browser.ContentViewCore;
 import org.chromium.content_public.browser.JavaScriptCallback;
@@ skipping 108 matching lines @@
      * synchronously evaluate JavaScript and then test the result.
      */
     public static class OnEvaluateJavaScriptResultHelper extends CallbackHelper {
         private String mJsonResult;
 
         /**
          * Starts evaluation of a given JavaScript code on a given webContents.
          * @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
                         public void handleJavaScriptResult(String jsonResult) {
                             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;
         }
 
         /**
          * Returns the JSON result of a previously completed JavaScript evaluation and
          * resets the helper to accept new evaluations.
          * @return String JSON result of a previously completed JavaScript evaluation.
          */
@@ skipping 63 matching lines @@
     }
 
     public OnReceivedErrorHelper getOnReceivedErrorHelper() {
         return mTestWebContentsObserver.getOnReceivedErrorHelper();
     }
 
     public OnStartContentIntentHelper getOnStartContentIntentHelper() {
         return mTestContentViewClient.getOnStartContentIntentHelper();
     }
 }