Reland "Add ExecuteJavaScriptForTest and make all tests use it"

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

Index: content/public/android/java/src/org/chromium/content_public/browser/WebContents.java
diff --git a/content/public/android/java/src/org/chromium/content_public/browser/WebContents.java b/content/public/android/java/src/org/chromium/content_public/browser/WebContents.java
index 5be1f9253d32d5aac42c3c6acece73445272f66b..5dad2d6a5848488d5f6b2a65e3bfb5736a56ed8d 100644
--- a/content/public/android/java/src/org/chromium/content_public/browser/WebContents.java
+++ b/content/public/android/java/src/org/chromium/content_public/browser/WebContents.java
@@ -218,16 +218,31 @@ public interface WebContents extends Parcelable {
      * 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.
      */
-    @VisibleForTesting
     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);
+
+    /**
      * Adds a log message to dev tools console. |level| must be a value of
      * org.chromium.content_public.common.ConsoleMessageLevel.
      */