Revert of Add ExecuteJavaScriptForTest and make all tests use it

android_webview/javatests/src/org/chromium/android_webview/test/AwJavaBridgeTest.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.android_webview.test;
 
 import android.os.Build;
 import android.test.suitebuilder.annotation.SmallTest;
 import android.webkit.JavascriptInterface;
 
@@ skipping 52 matching lines @@
             }
         });
 
         loadDataSync(awContents, mContentsClient.getOnPageFinishedHelper(), html,
                 "text/html", false);
 
         // Ensure the JS interface object is there, and invoke the test method.
         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);
     }
 
     @SmallTest
     @Feature({"AndroidWebView", "Android-JavaBridge"})
     public void testTwoWebViewsCreatedSimultaneously() throws Throwable {
         final AwContents awContents1 = mTestContainerView.getAwContents();
         final TestAwContentsClient client2 = new TestAwContentsClient();
         final AwTestContainerView view2 = createAwTestContainerViewOnMainSync(client2);
@@ skipping 74 matching lines @@
         });
         loadDataSync(awContents2, client2.getOnPageFinishedHelper(), html,
                 "text/html", false);
 
         assertEquals("1",
                 executeJavaScriptAndWaitForResult(awContents1, mContentsClient, "test.getValue()"));
         assertEquals("2",
                 executeJavaScriptAndWaitForResult(awContents2, client2, "test.getValue()"));
     }
 }