Revert of Add ExecuteJavaScriptForTest and make all tests use it

content/public/android/java/src/org/chromium/content_public/browser/WebContents.java

 // Copyright 2014 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_public.browser;
 
 import android.os.Parcelable;
 
 import org.chromium.base.VisibleForTesting;
 
@@ skipping 200 matching lines @@
 
     /**
      * Resumes the requests for a newly created window.
      */
     void resumeLoadingCreatedWebContents();
 
     /**
      * Injects the passed Javascript code in the current page and evaluates it.
      * If a result is required, pass in a callback.
      *
-     * It is not possible to use this method to evaluate JavaScript on web
-     * content, only on WebUI pages.
-     *
-     * @param script The Javascript to execute.
-     * @param callback The callback to be fired off when a result is ready. The script's
-     *                 result will be json encoded and passed as the parameter, and the call
-     *                 will be made on the main thread.
-     *                 If no result is required, pass null.
-     */
-    void evaluateJavaScript(String script, JavaScriptCallback callback);
-
-    /**
-     * Injects the passed Javascript code in the current page and evaluates it.
-     * If a result is required, pass in a callback.
-     *
      * @param script The Javascript to execute.
      * @param callback The callback to be fired off when a result is ready. The script's
      *                 result will be json encoded and passed as the parameter, and the call
      *                 will be made on the main thread.
      *                 If no result is required, pass null.
      */
     @VisibleForTesting
-    void evaluateJavaScriptForTests(String script, JavaScriptCallback callback);
+    void evaluateJavaScript(String script, JavaScriptCallback callback);
 
     /**
      * Adds a log message to dev tools console. |level| must be a value of
      * org.chromium.content_public.common.ConsoleMessageLevel.
      */
     void addMessageToDevToolsConsole(int level, String message);
 
     /**
      * Returns whether the initial empty page has been accessed by a script from another
      * page. Always false after the first commit.
@@ skipping 38 matching lines @@
      */
     void addObserver(WebContentsObserver observer);
 
     /**
      * Remove an observer from the WebContents
      *
      * @param observer The observer to remove.
      */
     void removeObserver(WebContentsObserver observer);
 }