[Android Webview] Refactor LoadUrlTest and work on embedded_test_server custom handler

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

Index: android_webview/javatests/src/org/chromium/android_webview/test/AcceptLanguageTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AcceptLanguageTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AcceptLanguageTest.java
index 862517558a6dc5c13c2f9fa214dea0438902fd31..fdbc21483e790307f0a9fafc35a3cc73dfb69c28 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AcceptLanguageTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AcceptLanguageTest.java
@@ -82,9 +82,7 @@ public class AcceptLanguageTest extends AwTestBase {
         loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), url);
 
         String[] acceptLanguages = getAcceptLanguages(
-                JSUtils.executeJavaScriptAndWaitForResult(
-                        this, mAwContents, mContentsClient.getOnEvaluateJavaScriptResultHelper(),
-                        "document.body.textContent"));
+                getJavaScriptResultBodyTextContent(mAwContents, mContentsClient));
         assertEquals(LocaleUtils.getDefaultLocaleString(), acceptLanguages[0]);
 
         String[] acceptLanguagesJs = getAcceptLanguages(
@@ -104,9 +102,7 @@ public class AcceptLanguageTest extends AwTestBase {
         loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), url);
 
         acceptLanguages = getAcceptLanguages(
-                JSUtils.executeJavaScriptAndWaitForResult(
-                        this, mAwContents, mContentsClient.getOnEvaluateJavaScriptResultHelper(),
-                        "document.body.textContent"));
+                getJavaScriptResultBodyTextContent(mAwContents, mContentsClient));
         assertEquals(LocaleUtils.getDefaultLocaleString(), acceptLanguages[0]);
     }
 
@@ -127,9 +123,8 @@ public class AcceptLanguageTest extends AwTestBase {
         String url = mTestServer.getURL("/echoheader?Accept-Language");
         loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), url);
 
-        String[] acceptLanguages = getAcceptLanguages(JSUtils.executeJavaScriptAndWaitForResult(
-                this, mAwContents, mContentsClient.getOnEvaluateJavaScriptResultHelper(),
-                "document.body.textContent"));
+        String[] acceptLanguages = getAcceptLanguages(
+                getJavaScriptResultBodyTextContent(mAwContents, mContentsClient));
         assertEquals(
                 LocaleUtils.getDefaultLocaleListString(), TextUtils.join(",", acceptLanguages));
 
@@ -148,9 +143,8 @@ public class AcceptLanguageTest extends AwTestBase {
 
         loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), url);
 
-        acceptLanguages = getAcceptLanguages(JSUtils.executeJavaScriptAndWaitForResult(this,
-                mAwContents, mContentsClient.getOnEvaluateJavaScriptResultHelper(),
-                "document.body.textContent"));
+        acceptLanguages = getAcceptLanguages(
+                getJavaScriptResultBodyTextContent(mAwContents, mContentsClient));
         assertEquals(
                 LocaleUtils.getDefaultLocaleListString(), TextUtils.join(",", acceptLanguages));
 
@@ -161,9 +155,8 @@ public class AcceptLanguageTest extends AwTestBase {
 
         loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), url);
 
-        acceptLanguages = getAcceptLanguages(JSUtils.executeJavaScriptAndWaitForResult(this,
-                mAwContents, mContentsClient.getOnEvaluateJavaScriptResultHelper(),
-                "document.body.textContent"));
+        acceptLanguages = getAcceptLanguages(
+                getJavaScriptResultBodyTextContent(mAwContents, mContentsClient));
         assertEquals(
                 LocaleUtils.getDefaultLocaleListString(), TextUtils.join(",", acceptLanguages));
 
@@ -174,9 +167,8 @@ public class AcceptLanguageTest extends AwTestBase {
 
         loadUrlSync(mAwContents, mContentsClient.getOnPageFinishedHelper(), url);
 
-        acceptLanguages = getAcceptLanguages(JSUtils.executeJavaScriptAndWaitForResult(this,
-                mAwContents, mContentsClient.getOnEvaluateJavaScriptResultHelper(),
-                "document.body.textContent"));
+        acceptLanguages = getAcceptLanguages(
+                getJavaScriptResultBodyTextContent(mAwContents, mContentsClient));
         String[] acceptLangs = Arrays.copyOfRange(acceptLanguages, 0, acceptLanguages.length - 1);
         assertEquals(LocaleUtils.getDefaultLocaleListString(), TextUtils.join(",", acceptLangs));
     }