Revert of Add ExecuteJavaScriptForTest and make all tests use it

content/public/android/javatests/src/org/chromium/content/browser/ContentViewLocationTest.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.content.browser.test.util.Criteria;
@@ skipping 27 matching lines @@
     private void showContentViewOnUiThread() {
         getInstrumentation().runOnMainSync(new Runnable() {
                 @Override
                 public void run() {
                     getContentViewCore().onShow();
                 }
         });
     }
 
     private void pollForPositionCallback() throws Throwable {
-        mJavascriptHelper.evaluateJavaScriptForTests(getWebContents(),
+        mJavascriptHelper.evaluateJavaScript(getWebContents(),
                 "positionCount = 0");
         mJavascriptHelper.waitUntilHasValue();
         assertEquals(0, Integer.parseInt(mJavascriptHelper.getJsonResultAndClear()));
 
         assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
                 @Override
                 public boolean isSatisfied() {
-                    mJavascriptHelper.evaluateJavaScriptForTests(getWebContents(), "positionCount");
+                    mJavascriptHelper.evaluateJavaScript(getWebContents(), "positionCount");
                     try {
                         mJavascriptHelper.waitUntilHasValue();
                     } catch (Exception e) {
                         fail();
                     }
                     return Integer.parseInt(mJavascriptHelper.getJsonResultAndClear()) > 0;
                 }
         }));
     }
 
     private void startGeolocationWatchPosition() throws Throwable {
-        mJavascriptHelper.evaluateJavaScriptForTests(getWebContents(),
+        mJavascriptHelper.evaluateJavaScript(getWebContents(),
                 "initiate_watchPosition();");
         mJavascriptHelper.waitUntilHasValue();
     }
 
     private void ensureGeolocationRunning(final boolean running) throws Exception {
         assertTrue(CriteriaHelper.pollForCriteria(new Criteria() {
             @Override
             public boolean isSatisfied() {
                 return mMockLocationProvider.isRunning() == running;
             }
@@ skipping 30 matching lines @@
     public void testWatchHideShowStop() throws Throwable {
 
         startGeolocationWatchPosition();
         pollForPositionCallback();
         ensureGeolocationRunning(true);
 
         // Now hide the ContentView and ensure that geolocation stops.
         hideContentViewOnUiThread();
         ensureGeolocationRunning(false);
 
-        mJavascriptHelper.evaluateJavaScriptForTests(getWebContents(),
+        mJavascriptHelper.evaluateJavaScript(getWebContents(),
                 "positionCount = 0");
         mJavascriptHelper.waitUntilHasValue();
 
         // Show the ContentView again and ensure that geolocation starts again.
         showContentViewOnUiThread();
         pollForPositionCallback();
         ensureGeolocationRunning(true);
 
         // Navigate away and ensure that geolocation stops.
         loadUrl(getContentViewCore().getWebContents().getNavigationController(),
@@ skipping 38 matching lines @@
         hideContentViewOnUiThread();
         startGeolocationWatchPosition();
         ensureGeolocationRunning(false);
 
         loadUrl(getContentViewCore().getWebContents().getNavigationController(),
                 mTestCallbackHelperContainer, new LoadUrlParams("about:blank"));
         showContentViewOnUiThread();
         ensureGeolocationRunning(false);
     }
 }