Revert of Add ExecuteJavaScriptForTest and make all tests use it

android_webview/javatests/src/org/chromium/android_webview/test/GeolocationTest.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.android_webview.test;
 
 import android.os.Build;
 import android.test.suitebuilder.annotation.MediumTest;
 import android.webkit.GeolocationPermissions;
 
@@ skipping 95 matching lines @@
 
     /**
      * Ensure that a call to navigator.getCurrentPosition works in WebView.
      */
     @MediumTest
     @Feature({"AndroidWebView"})
     public void testGetPosition() throws Throwable {
         loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
                 RAW_HTML, "text/html", false);
 
-        mAwContents.evaluateJavaScriptForTests("initiate_getCurrentPosition();", null);
+        mAwContents.evaluateJavaScript("initiate_getCurrentPosition();", null);
 
         poll(new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
                 return getPositionCountFromJS() == 1;
             }
         });
 
-        mAwContents.evaluateJavaScriptForTests("initiate_getCurrentPosition();", null);
+        mAwContents.evaluateJavaScript("initiate_getCurrentPosition();", null);
         poll(new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
                 return getPositionCountFromJS() == 2;
             }
         });
     }
 
     /**
      * Ensure that a call to navigator.watchPosition works in WebView.
      */
     @MediumTest
     @Feature({"AndroidWebView"})
     public void testWatchPosition() throws Throwable {
         loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
                 RAW_HTML, "text/html", false);
 
-        mAwContents.evaluateJavaScriptForTests("initiate_watchPosition();", null);
+        mAwContents.evaluateJavaScript("initiate_watchPosition();", null);
 
         poll(new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
                 return getPositionCountFromJS() > 1;
             }
         });
     }
 
     @MediumTest
     @Feature({"AndroidWebView"})
     public void testPauseGeolocationOnPause() throws Throwable {
         // Start a watch going.
         loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
                 RAW_HTML, "text/html", false);
 
-        mAwContents.evaluateJavaScriptForTests("initiate_watchPosition();", null);
+        mAwContents.evaluateJavaScript("initiate_watchPosition();", null);
 
         poll(new Callable<Boolean>() {
             @Override
             public Boolean call() throws Exception {
                 return getPositionCountFromJS() > 1;
             }
         });
 
         ensureGeolocationRunning(true);
 
@@ skipping 37 matching lines @@
             @Override
             public void run() {
                 mAwContents.onPause();
             }
         });
 
         // Start a watch going.
         loadDataSync(mAwContents, mContentsClient.getOnPageFinishedHelper(),
                 RAW_HTML, "text/html", false);
 
-        mAwContents.evaluateJavaScriptForTests("initiate_watchPosition();", null);
+        mAwContents.evaluateJavaScript("initiate_watchPosition();", null);
 
         assertEquals(0, getPositionCountFromJS());
 
         ensureGeolocationRunning(false);
 
         getInstrumentation().runOnMainSync(new Runnable() {
             @Override
             public void run() {
                 mAwContents.onResume();
             }
@@ skipping 26 matching lines @@
             @Override
             public void run() {
                 mAwContents.onResume();
             }
         });
 
         ensureGeolocationRunning(false);
     }
 
 }