Add ExecuteJavaScriptForTest and make all tests use it

content/public/android/java/src/org/chromium/content/browser/webcontents/WebContentsImpl.java

 // Copyright 2013 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.webcontents;
 
 import android.graphics.Color;
 import android.os.Bundle;
 import android.os.Parcel;
 import android.os.ParcelUuid;
@@ skipping 275 matching lines @@
     public boolean isIncognito() {
         return nativeIsIncognito(mNativeWebContentsAndroid);
     }
 
     @Override
     public void resumeLoadingCreatedWebContents() {
         nativeResumeLoadingCreatedWebContents(mNativeWebContentsAndroid);
     }
 
     @Override
+    public void evaluateJavaScript(String script, JavaScriptCallback callback) {
+        nativeEvaluateJavaScript(mNativeWebContentsAndroid, script, callback);
+    }
+
+    @Override
     @VisibleForTesting
-    public void evaluateJavaScript(String script, JavaScriptCallback callback) {
-        nativeEvaluateJavaScript(mNativeWebContentsAndroid, script, callback);
+    public void evaluateJavaScriptForTests(String script, JavaScriptCallback callback) {
+        nativeEvaluateJavaScriptForTests(mNativeWebContentsAndroid, script, callback);
     }
 
     @Override
     public void addMessageToDevToolsConsole(int level, String message) {
         nativeAddMessageToDevToolsConsole(mNativeWebContentsAndroid, level, message);
     }
 
     @Override
     public boolean hasAccessedInitialDocument() {
         return nativeHasAccessedInitialDocument(mNativeWebContentsAndroid);
@@ skipping 105 matching lines @@
     private native void nativeScrollFocusedEditableNodeIntoView(long nativeWebContentsAndroid);
     private native void nativeSelectWordAroundCaret(long nativeWebContentsAndroid);
     private native void nativeAdjustSelectionByCharacterOffset(
             long nativeWebContentsAndroid, int startAdjust, int endAdjust);
     private native String nativeGetURL(long nativeWebContentsAndroid);
     private native String nativeGetLastCommittedURL(long nativeWebContentsAndroid);
     private native boolean nativeIsIncognito(long nativeWebContentsAndroid);
     private native void nativeResumeLoadingCreatedWebContents(long nativeWebContentsAndroid);
     private native void nativeEvaluateJavaScript(long nativeWebContentsAndroid,
             String script, JavaScriptCallback callback);
+    private native void nativeEvaluateJavaScriptForTests(long nativeWebContentsAndroid,
+            String script, JavaScriptCallback callback);
     private native void nativeAddMessageToDevToolsConsole(
             long nativeWebContentsAndroid, int level, String message);
     private native boolean nativeHasAccessedInitialDocument(
             long nativeWebContentsAndroid);
     private native int nativeGetThemeColor(long nativeWebContentsAndroid);
     private native void nativeRequestAccessibilitySnapshot(long nativeWebContentsAndroid,
             AccessibilitySnapshotCallback callback, float offsetY, float scrollX);
     private native void nativeResumeMediaSession(long nativeWebContentsAndroid);
     private native void nativeSuspendMediaSession(long nativeWebContentsAndroid);
 }