Revert of Add ExecuteJavaScriptForTest and make all tests use it

content/public/android/javatests/src/org/chromium/content/browser/NavigationTest.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;
 
 import android.test.suitebuilder.annotation.MediumTest;
 
 import org.chromium.base.test.util.Feature;
 import org.chromium.base.test.util.UrlUtils;
@@ skipping 100 matching lines @@
         final String urlLoadTime = UrlUtils.encodeHtmlDataUri(htmlLoadTime);
 
         ContentShellActivity activity = launchContentShellWithUrl(urlLoadTime);
         waitForActiveShellToBeDoneLoading();
         ContentViewCore contentViewCore = activity.getActiveContentViewCore();
         TestCallbackHelperContainer testCallbackHelperContainer =
                 new TestCallbackHelperContainer(contentViewCore);
         OnEvaluateJavaScriptResultHelper javascriptHelper = new OnEvaluateJavaScriptResultHelper();
 
         // Grab the first timestamp.
-        javascriptHelper.evaluateJavaScriptForTests(
-                contentViewCore.getWebContents(), "getLoadtime();");
+        javascriptHelper.evaluateJavaScript(contentViewCore.getWebContents(), "getLoadtime();");
         javascriptHelper.waitUntilHasValue();
         String firstTimestamp = javascriptHelper.getJsonResultAndClear();
         assertNotNull("Timestamp was null.", firstTimestamp);
 
         // Grab the timestamp after a reload and make sure they don't match.
         reload(contentViewCore.getWebContents().getNavigationController(),
                 testCallbackHelperContainer);
-        javascriptHelper.evaluateJavaScriptForTests(
-                contentViewCore.getWebContents(), "getLoadtime();");
+        javascriptHelper.evaluateJavaScript(contentViewCore.getWebContents(), "getLoadtime();");
         javascriptHelper.waitUntilHasValue();
         String secondTimestamp = javascriptHelper.getJsonResultAndClear();
         assertNotNull("Timestamp was null.", secondTimestamp);
         assertFalse("Timestamps matched.", firstTimestamp.equals(secondTimestamp));
     }
 }