Revert of Add ExecuteJavaScriptForTest and make all tests use it (patchset #15 id:270001 of https://codereview.chromium.org/1123783002/)

Reason for revert:
Speculatively reverting to address failures,

 http://build.chromium.org/p/chromium.webkit/builders/WebKit%20Linux/builds/51422

Original issue's description:
> Add ExecuteJavaScriptForTest and make all tests use it
>
> Additionally, restrict the URLs that ExecuteJavaScript can be invoked on
> to chrome-controlled URLs.
>
> R=jam@chromium.org
> BUG=507809
>
> Committed: https://crrev.com/904f14ebdc3bdb8e893df0a3211d09de42d5619c
> Cr-Commit-Position: refs/heads/master@{#340231}

TBR=jam@chromium.org,mdjones@chromium.org,torne@chromium.org,jochen@chromium.org
NOPRESUBMIT=true
NOTREECHECKS=true
NOTRY=true
BUG=507809

Review URL: https://codereview.chromium.org/1257603003

Cr-Commit-Position: refs/heads/master@{#340241}

7 files changed, 10 insertions, 29 deletions

diff --git a/android_webview/browser/aw_browser_main_parts.cc b/android_webview/browser/aw_browser_main_parts.cc
index 4c28f14..85fa1ea 100644
--- a/android_webview/browser/aw_browser_main_parts.cc
+++ b/android_webview/browser/aw_browser_main_parts.cc
@@ -19,7 +19,6 @@
 #include "base/files/file_path.h"
 #include "base/path_service.h"
 #include "content/public/browser/android/synchronous_compositor.h"
-#include "content/public/browser/render_frame_host.h"
 #include "content/public/browser/render_process_host.h"
 #include "content/public/common/content_client.h"
 #include "content/public/common/content_switches.h"
@@ -119,8 +118,6 @@ void AwBrowserMainParts::PreMainMessageLoopRun() {
     gfx::GLSurface::InitializeOneOff();
   }
 
-  content::RenderFrameHost::AllowInjectingJavaScriptForAndroidWebView();
-
   // This is needed for WebView Classic backwards compatibility
   // See crbug.com/298495
   content::SetMaxURLChars(20 * 1024 * 1024);
diff --git a/android_webview/java/src/org/chromium/android_webview/AwContents.java b/android_webview/java/src/org/chromium/android_webview/AwContents.java
index 8874bd7..3b7a165 100644
--- a/android_webview/java/src/org/chromium/android_webview/AwContents.java
+++ b/android_webview/java/src/org/chromium/android_webview/AwContents.java
@@ -2069,22 +2069,6 @@ public class AwContents implements SmartClipProvider,
         mWebContents.evaluateJavaScript(script, jsCallback);
     }
 
-    public void evaluateJavaScriptForTests(String script, final ValueCallback<String> callback) {
-        if (TRACE) Log.d(TAG, "evaluateJavascriptForTests=" + script);
-        if (isDestroyed()) return;
-        JavaScriptCallback jsCallback = null;
-        if (callback != null) {
-            jsCallback = new JavaScriptCallback() {
-                @Override
-                public void handleJavaScriptResult(String jsonResult) {
-                    callback.onReceiveValue(jsonResult);
-                }
-            };
-        }
-
-        mWebContents.evaluateJavaScriptForTests(script, jsCallback);
-    }
-
     /**
      * Post a message to a frame.
      *
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
index 6906936..5c9b9c5 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java
@@ -403,7 +403,7 @@ public class AwContentsTest extends AwTestBase {
                 AwSettings awSettings = awContents.getSettings();
                 awSettings.setJavaScriptEnabled(true);
                 awContents.addJavascriptInterface(new JavaScriptObject(callback), "bridge");
-                awContents.evaluateJavaScriptForTests("window.bridge.run();", null);
+                awContents.evaluateJavaScript("window.bridge.run();", null);
             }
         });
         callback.waitForCallback(0, 1, WAIT_TIMEOUT_MS, TimeUnit.MILLISECONDS);
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwJavaBridgeTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwJavaBridgeTest.java
index cfc3fe8..10a4974 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwJavaBridgeTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwJavaBridgeTest.java
@@ -70,7 +70,7 @@ public class AwJavaBridgeTest extends AwTestBase {
         assertEquals("\"function\"", executeJavaScriptAndWaitForResult(
                 awContents, mContentsClient, "typeof test.destroy"));
         int currentCallCount = client2.getOnPageFinishedHelper().getCallCount();
-        awContents.evaluateJavaScriptForTests("test.destroy()", null);
+        awContents.evaluateJavaScript("test.destroy()", null);
 
         client2.getOnPageFinishedHelper().waitForCallback(currentCallCount);
     }
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java
index dec1762..11eb3c5 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java
@@ -588,7 +588,7 @@ public class AwTestBase
         TestAwContentsClient.OnCreateWindowHelper onCreateWindowHelper =
                 parentAwContentsClient.getOnCreateWindowHelper();
         int currentCallCount = onCreateWindowHelper.getCallCount();
-        parentAwContents.evaluateJavaScriptForTests(triggerScript, null);
+        parentAwContents.evaluateJavaScript(triggerScript, null);
         onCreateWindowHelper.waitForCallback(
                 currentCallCount, 1, WAIT_TIMEOUT_MS, TimeUnit.MILLISECONDS);
     }
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/GeolocationTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/GeolocationTest.java
index 23beb13..98f45f7 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/GeolocationTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/GeolocationTest.java
@@ -113,7 +113,7 @@ public class GeolocationTest extends AwTestBase {
         loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
                 RAW_HTML, "text/html", false);
 
-        mAwContents.evaluateJavaScriptForTests("initiate_getCurrentPosition();", null);
+        mAwContents.evaluateJavaScript("initiate_getCurrentPosition();", null);
 
         poll(new Callable<Boolean>() {
             @Override
@@ -122,7 +122,7 @@ public class GeolocationTest extends AwTestBase {
             }
         });
 
-        mAwContents.evaluateJavaScriptForTests("initiate_getCurrentPosition();", null);
+        mAwContents.evaluateJavaScript("initiate_getCurrentPosition();", null);
         poll(new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
@@ -140,7 +140,7 @@ public class GeolocationTest extends AwTestBase {
         loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
                 RAW_HTML, "text/html", false);
 
-        mAwContents.evaluateJavaScriptForTests("initiate_watchPosition();", null);
+        mAwContents.evaluateJavaScript("initiate_watchPosition();", null);
 
         poll(new Callable<Boolean>() {
             @Override
@@ -157,7 +157,7 @@ public class GeolocationTest extends AwTestBase {
         loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
                 RAW_HTML, "text/html", false);
 
-        mAwContents.evaluateJavaScriptForTests("initiate_watchPosition();", null);
+        mAwContents.evaluateJavaScript("initiate_watchPosition();", null);
 
         poll(new Callable<Boolean>() {
             @Override
@@ -215,7 +215,7 @@ public class GeolocationTest extends AwTestBase {
         loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
                 RAW_HTML, "text/html", false);
 
-        mAwContents.evaluateJavaScriptForTests("initiate_watchPosition();", null);
+        mAwContents.evaluateJavaScript("initiate_watchPosition();", null);
 
         assertEquals(0, getPositionCountFromJS());
 
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/util/JSUtils.java b/android_webview/javatests/src/org/chromium/android_webview/test/util/JSUtils.java
index c522fa80..5f2b6ab 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/util/JSUtils.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/util/JSUtils.java
@@ -47,7 +47,7 @@ public class JSUtils {
         testCase.getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
-                awContents.getWebContents().evaluateJavaScriptForTests(
+                awContents.getWebContents().evaluateJavaScript(
                         "var evObj = document.createEvent('Events'); "
                                 + "evObj.initEvent('click', true, false); "
                                 + "document.getElementById('" + linkId + "').dispatchEvent(evObj);"
@@ -65,7 +65,7 @@ public class JSUtils {
         testCase.getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
-                onEvaluateJavaScriptResultHelper.evaluateJavaScriptForTests(
+                onEvaluateJavaScriptResultHelper.evaluateJavaScript(
                         awContents.getWebContents(), code);
             }
         });