Revert of Add ExecuteJavaScriptForTest and make all tests use it

content/public/android/javatests/src/org/chromium/content/browser/JavaBridgeBareboneTest.java

 // Copyright 2015 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;
 
 import android.test.suitebuilder.annotation.SmallTest;
 
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.UrlUtils;
@@ skipping 22 matching lines @@
             @Override
             public void run() {
                 getContentViewCore().addPossiblyUnsafeJavascriptInterface(
                         new Object(), name, null);
             }
         });
     }
 
     private String evaluateJsSync(String jsCode) throws Exception {
         OnEvaluateJavaScriptResultHelper javascriptHelper = new OnEvaluateJavaScriptResultHelper();
-        javascriptHelper.evaluateJavaScriptForTests(getWebContents(), jsCode);
+        javascriptHelper.evaluateJavaScript(getWebContents(), jsCode);
         javascriptHelper.waitUntilHasValue();
         return javascriptHelper.getJsonResultAndClear();
     }
 
     private void reloadSync() throws Throwable {
         OnPageFinishedHelper pageFinishedHelper =
                 mTestCallbackHelperContainer.getOnPageFinishedHelper();
         int currentCallCount = pageFinishedHelper.getCallCount();
         runTestOnUiThread(new Runnable() {
             @Override
@@ skipping 41 matching lines @@
     }
 
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testReloadAfterAddition() throws Throwable {
         injectDummyObject("testObject");
         reloadSync();
         assertEquals("\"object\"", evaluateJsSync("typeof testObject"));
     }
 }