Revert of Add ExecuteJavaScriptForTest and make all tests use it

android_webview/javatests/src/org/chromium/android_webview/test/AwTestBase.java

 // Copyright 2012 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.app.Instrumentation;
 import android.content.Context;
 import android.graphics.Bitmap;
 import android.test.ActivityInstrumentationTestCase2;
@@ skipping 570 matching lines @@
         } else {
             testWebServer.setResponseWithNoContentStatus(popupPath);
         }
 
         parentAwContentsClient.getOnCreateWindowHelper().setReturnValue(true);
         loadUrlSync(parentAwContents, parentAwContentsClient.getOnPageFinishedHelper(), parentUrl);
 
         TestAwContentsClient.OnCreateWindowHelper onCreateWindowHelper =
                 parentAwContentsClient.getOnCreateWindowHelper();
         int currentCallCount = onCreateWindowHelper.getCallCount();
-        parentAwContents.evaluateJavaScriptForTests(triggerScript, null);
+        parentAwContents.evaluateJavaScript(triggerScript, null);
         onCreateWindowHelper.waitForCallback(
                 currentCallCount, 1, WAIT_TIMEOUT_MS, TimeUnit.MILLISECONDS);
     }
 
     /**
      * POD object for holding references to helper objects of a popup window.
      */
     public static class PopupInfo {
         public final TestAwContentsClient popupContentsClient;
         public final AwTestContainerView popupContainerView;
@@ skipping 25 matching lines @@
             }
         });
 
         OnPageFinishedHelper onPageFinishedHelper = popupContentsClient.getOnPageFinishedHelper();
         int callCount = onPageFinishedHelper.getCallCount();
         onPageFinishedHelper.waitForCallback(callCount, 1, WAIT_TIMEOUT_MS, TimeUnit.MILLISECONDS);
 
         return new PopupInfo(popupContentsClient, popupContainerView, popupContents);
     }
 }