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

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

Index: android_webview/javatests/src/org/chromium/android_webview/test/LoadUrlTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/LoadUrlTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/LoadUrlTest.java
index 3c9c995b32c12133fa6f983f8909f8e7f639dae6..8d2be520678f4a62190a8e0249d1498844bb1539 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/LoadUrlTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/LoadUrlTest.java
@@ -7,23 +7,19 @@ package org.chromium.android_webview.test;
 import android.support.test.filters.SmallTest;
 import android.util.Pair;
 
-import org.apache.http.Header;
-import org.apache.http.HttpRequest;
-
 import org.chromium.android_webview.AwContents;
-import org.chromium.android_webview.AwSettings;
 import org.chromium.android_webview.test.util.CommonResources;
 import org.chromium.android_webview.test.util.JSUtils;
 import org.chromium.base.annotations.SuppressFBWarnings;
 import org.chromium.base.test.util.CallbackHelper;
 import org.chromium.base.test.util.Feature;
 import org.chromium.content.browser.test.util.HistoryUtils;
+import org.chromium.net.test.AwEmbeddedTestServer;
 import org.chromium.net.test.util.TestWebServer;
 
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
-import java.util.Locale;
 import java.util.Map;
 import java.util.concurrent.TimeUnit;
 
@@ -31,6 +27,20 @@ import java.util.concurrent.TimeUnit;
  * Test suite for loadUrl().
  */
 public class LoadUrlTest extends AwTestBase {
+    private AwEmbeddedTestServer mTestServer;
+
+    @Override
+    public void setUp() throws Exception {
+        super.setUp();
+        mTestServer = AwEmbeddedTestServer.createAndStartServer(getInstrumentation().getContext());
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        mTestServer.stopAndDestroyServer();
+        super.tearDown();
+    }
+
     @SmallTest
     @Feature({"AndroidWebView"})
     public void testDataUrl() throws Throwable {
@@ -115,21 +125,13 @@ public class LoadUrlTest extends AwTestBase {
         return result;
     }
 
-    private void validateRequestHeaders(String[] refNamesAndValues, HttpRequest request) {
-        for (int i = 0; i < refNamesAndValues.length; i += 2) {
-            Header[] matchingHeaders = request.getHeaders(refNamesAndValues[i]);
-            assertEquals(1, matchingHeaders.length);
-
-            Header header = matchingHeaders[0];
-            assertEquals(refNamesAndValues[i].toLowerCase(Locale.ENGLISH), header.getName());
-            assertEquals(refNamesAndValues[i + 1], header.getValue());
-        }
-    }
-
-    private void validateNoRequestHeaders(String[] refNamesAndValues, HttpRequest request) {
-        for (int i = 0; i < refNamesAndValues.length; i += 2) {
-            Header[] matchingHeaders = request.getHeaders(refNamesAndValues[i]);
-            assertEquals(0, matchingHeaders.length);
+    private void validateHeadersValue(final AwContents awContents,
+            final TestAwContentsClient contentsClient, String[] extraHeader, boolean realValue)
+            throws Exception {
+        String textContent = getJavaScriptResultBodyTextContent(awContents, contentsClient);
+        String[] header_values = textContent.split("\\\\n");
+        for (int i = 0; i < extraHeader.length; i += 2) {
+            assertEquals(realValue ? extraHeader[i + 1] : "None", header_values[i / 2]);
         }
     }
 
@@ -140,32 +142,23 @@ public class LoadUrlTest extends AwTestBase {
         final AwTestContainerView testContainerView =
                 createAwTestContainerViewOnMainSync(contentsClient);
         final AwContents awContents = testContainerView.getAwContents();
-
-        TestWebServer webServer = TestWebServer.start();
-        try {
-            final String imagePath = "/" + CommonResources.FAVICON_FILENAME;
-            webServer.setResponseBase64(imagePath,
-                    CommonResources.FAVICON_DATA_BASE64, CommonResources.getImagePngHeaders(true));
-            final String path = "/load_url_with_extra_headers_test.html";
-            final String url = webServer.setResponse(
-                    path,
-                    CommonResources.getOnImageLoadedHtml(CommonResources.FAVICON_FILENAME),
-                    null);
-            String[] extraHeaders = {
-                "X-ExtraHeaders1", "extra-header-data1",
-                "x-extraHeaders2", "EXTRA-HEADER-DATA2"
-            };
-
-            loadUrlWithExtraHeadersSync(awContents,
-                                        contentsClient.getOnPageFinishedHelper(),
-                                        url,
-                                        createHeadersMap(extraHeaders));
-            validateRequestHeaders(extraHeaders, webServer.getLastRequest(path));
-            // Verify that extra headers are only passed for the main resource.
-            validateNoRequestHeaders(extraHeaders, webServer.getLastRequest(imagePath));
-        } finally {
-            webServer.shutdown();
-        }
+        enableJavaScriptOnUiThread(awContents);
+
+        String[] extraHeaders = {
+                "X-ExtraHeaders1", "extra-header-data1", "x-extraHeaders2", "EXTRA-HEADER-DATA2"};
+        final String url1 =
+                mTestServer.getURL("/echoheader?" + extraHeaders[0] + "&" + extraHeaders[2]);
+        final String url2 =
+                mTestServer.getURL("/echoheader?" + extraHeaders[0] + "&" + extraHeaders[2]);
+
+        loadUrlWithExtraHeadersSync(awContents, contentsClient.getOnPageFinishedHelper(), url1,
+                createHeadersMap(extraHeaders));
+        // Verify that extra headers are passed to the loaded url.
+        validateHeadersValue(awContents, contentsClient, extraHeaders, true);
+
+        loadUrlSync(awContents, contentsClient.getOnPageFinishedHelper(), url2);
+        // Verify that extra headers are only passed for the main resource.
+        validateHeadersValue(awContents, contentsClient, extraHeaders, false);
     }
 
     @SmallTest
@@ -176,32 +169,17 @@ public class LoadUrlTest extends AwTestBase {
                 createAwTestContainerViewOnMainSync(contentsClient);
         final AwContents awContents = testContainerView.getAwContents();
 
-        TestWebServer webServer = TestWebServer.start();
-        try {
-            final String path = "/no_overriding_of_existing_headers_test.html";
-            final String url = webServer.setResponse(
-                    path,
-                    "<html><body>foo</body></html>",
-                    null);
-            String[] extraHeaders = {
-                "user-agent", "007"
-            };
-
-            loadUrlWithExtraHeadersSync(awContents,
-                                        contentsClient.getOnPageFinishedHelper(),
-                                        url,
-                                        createHeadersMap(extraHeaders));
-            Header[] matchingHeaders = webServer.getLastRequest(path).getHeaders(extraHeaders[0]);
-            assertEquals(1, matchingHeaders.length);
-            Header header = matchingHeaders[0];
-            assertEquals(extraHeaders[0].toLowerCase(Locale.ENGLISH),
-                    header.getName().toLowerCase(Locale.ENGLISH));
-            // Just check that the value is there, and it's not the one we provided.
-            assertTrue(header.getValue().length() > 0);
-            assertFalse(extraHeaders[1].equals(header.getValue()));
-        } finally {
-            webServer.shutdown();
-        }
+        enableJavaScriptOnUiThread(awContents);
+
+        final String url = mTestServer.getURL("/echoheader?user-agent");
+        String[] extraHeaders = {"user-agent", "007"};
+
+        loadUrlWithExtraHeadersSync(awContents, contentsClient.getOnPageFinishedHelper(), url,
+                createHeadersMap(extraHeaders));
+        String header = getJavaScriptResultBodyTextContent(awContents, contentsClient);
+        // Just check that the value is there, and it's not the one we provided.
+        assertFalse(header.isEmpty());
+        assertFalse(extraHeaders[1].equals(header));
     }
 
     @SmallTest
@@ -211,30 +189,17 @@ public class LoadUrlTest extends AwTestBase {
         final AwTestContainerView testContainerView =
                 createAwTestContainerViewOnMainSync(contentsClient);
         final AwContents awContents = testContainerView.getAwContents();
-
-        TestWebServer webServer = TestWebServer.start();
-        try {
-            final String path = "/reload_with_extra_headers_test.html";
-            final String url = webServer.setResponse(path,
-                    "<html><body>foo</body></html>",
-                    createHeadersList(new String[] { "cache-control", "no-cache, no-store" }));
-            String[] extraHeaders = {
-                "X-ExtraHeaders1", "extra-header-data1",
-                "x-extraHeaders2", "EXTRA-HEADER-DATA2"
-            };
-
-            loadUrlWithExtraHeadersSync(awContents,
-                                        contentsClient.getOnPageFinishedHelper(),
-                                        url,
-                                        createHeadersMap(extraHeaders));
-            validateRequestHeaders(extraHeaders, webServer.getLastRequest(path));
-
-            reloadSync(awContents, contentsClient.getOnPageFinishedHelper());
-            assertEquals(2, webServer.getRequestCount(path));
-            validateRequestHeaders(extraHeaders, webServer.getLastRequest(path));
-        } finally {
-            webServer.shutdown();
-        }
+        enableJavaScriptOnUiThread(awContents);
+        String[] extraHeaders = {
+                "X-ExtraHeaders1", "extra-header-data1", "x-extraHeaders2", "EXTRA-HEADER-DATA2"};
+        final String url =
+                mTestServer.getURL("/echoheader?" + extraHeaders[0] + "&" + extraHeaders[2]);
+
+        loadUrlWithExtraHeadersSync(awContents, contentsClient.getOnPageFinishedHelper(), url,
+                createHeadersMap(extraHeaders));
+        validateHeadersValue(awContents, contentsClient, extraHeaders, true);
+        reloadSync(awContents, contentsClient.getOnPageFinishedHelper());
+        validateHeadersValue(awContents, contentsClient, extraHeaders, true);
     }
 
     @SuppressFBWarnings("DLS_DEAD_LOCAL_STORE")
@@ -246,34 +211,21 @@ public class LoadUrlTest extends AwTestBase {
                 createAwTestContainerViewOnMainSync(contentsClient);
         final AwContents awContents = testContainerView.getAwContents();
 
-        TestWebServer webServer = TestWebServer.start();
-        try {
-            final String path = "/redirect_and_reload_with_extra_headers_test.html";
-            final String url = webServer.setResponse(path,
-                    "<html><body>foo</body></html>",
-                    createHeadersList(new String[] { "cache-control", "no-cache, no-store" }));
-            final String redirectedPath = "/redirected.html";
-            final String redirectedUrl = webServer.setRedirect(redirectedPath, path);
-            String[] extraHeaders = {
-                "X-ExtraHeaders1", "extra-header-data1",
-                "x-extraHeaders2", "EXTRA-HEADER-DATA2"
-            };
-
-            loadUrlWithExtraHeadersSync(awContents,
-                                        contentsClient.getOnPageFinishedHelper(),
-                                        redirectedUrl,
-                                        createHeadersMap(extraHeaders));
-            validateRequestHeaders(extraHeaders, webServer.getLastRequest(path));
-            validateRequestHeaders(extraHeaders, webServer.getLastRequest(redirectedPath));
-
-            // WebView will only reload the main page.
-            reloadSync(awContents, contentsClient.getOnPageFinishedHelper());
-            assertEquals(2, webServer.getRequestCount(path));
-            // No extra headers. This is consistent with legacy behavior.
-            validateNoRequestHeaders(extraHeaders, webServer.getLastRequest(path));
-        } finally {
-            webServer.shutdown();
-        }
+        enableJavaScriptOnUiThread(awContents);
+
+        String[] extraHeaders = {
+                "X-ExtraHeaders1", "extra-header-data1", "x-extraHeaders2", "EXTRA-HEADER-DATA2"};
+        final String redirectedUrl =
+                mTestServer.getURL("/echoheader?" + extraHeaders[0] + "&" + extraHeaders[2]);
+        final String initialUrl = mTestServer.getURL("/server-redirect?" + redirectedUrl);
+        loadUrlWithExtraHeadersSync(awContents, contentsClient.getOnPageFinishedHelper(),
+                initialUrl, createHeadersMap(extraHeaders));
+        validateHeadersValue(awContents, contentsClient, extraHeaders, true);
+
+        // WebView will only reload the main page.
+        reloadSync(awContents, contentsClient.getOnPageFinishedHelper());
+        // No extra headers. This is consistent with legacy behavior.
+        validateHeadersValue(awContents, contentsClient, extraHeaders, false);
     }
 
     @SuppressFBWarnings("DLS_DEAD_LOCAL_STORE")
@@ -284,48 +236,30 @@ public class LoadUrlTest extends AwTestBase {
         final AwTestContainerView testContainerView =
                 createAwTestContainerViewOnMainSync(contentsClient);
         final AwContents awContents = testContainerView.getAwContents();
-        final AwSettings settings = getAwSettingsOnUiThread(awContents);
-        settings.setJavaScriptEnabled(true);
-
-        TestWebServer webServer = TestWebServer.start();
-        try {
-            final String nextPath = "/next.html";
-            final String nextUrl = webServer.setResponse(nextPath,
-                    "<html><body>Next!</body></html>",
-                    null);
-            final String path = "/renderer_nav_and_go_back_with_extra_headers_test.html";
-            final String url = webServer.setResponse(path,
-                    "<html><body><a id=\"next\" href=\"next.html\">Next!</a></body></html>",
-                    createHeadersList(new String[] { "cache-control", "no-cache, no-store" }));
-            String[] extraHeaders = {
-                "X-ExtraHeaders1", "extra-header-data1",
-                "x-extraHeaders2", "EXTRA-HEADER-DATA2"
-            };
-
-            loadUrlWithExtraHeadersSync(awContents,
-                                        contentsClient.getOnPageFinishedHelper(),
-                                        url,
-                                        createHeadersMap(extraHeaders));
-            validateRequestHeaders(extraHeaders, webServer.getLastRequest(path));
-
-            int currentCallCount = contentsClient.getOnPageFinishedHelper().getCallCount();
-            JSUtils.clickOnLinkUsingJs(this,
-                                       awContents,
-                                       contentsClient.getOnEvaluateJavaScriptResultHelper(),
-                                       "next");
-            contentsClient.getOnPageFinishedHelper().waitForCallback(
-                    currentCallCount, 1, WAIT_TIMEOUT_MS, TimeUnit.MILLISECONDS);
-            // No extra headers for the page navigated via clicking.
-            validateNoRequestHeaders(extraHeaders, webServer.getLastRequest(nextPath));
-
-            HistoryUtils.goBackSync(getInstrumentation(),
-                                    awContents.getWebContents(),
-                                    contentsClient.getOnPageFinishedHelper());
-            assertEquals(2, webServer.getRequestCount(path));
-            validateRequestHeaders(extraHeaders, webServer.getLastRequest(path));
-        } finally {
-            webServer.shutdown();
-        }
+        enableJavaScriptOnUiThread(awContents);
+
+        String[] extraHeaders = {
+                "X-ExtraHeaders1", "extra-header-data1", "x-extraHeaders2", "EXTRA-HEADER-DATA2"};
+        final String redirectedUrl =
+                mTestServer.getURL("/echoheader?" + extraHeaders[0] + "&" + extraHeaders[2]);
+        final String initialUrl = mTestServer.getURL("/click-redirect?url=" + redirectedUrl
+                + "|echoheaders=" + extraHeaders[0] + "&" + extraHeaders[2]);
+
+        loadUrlWithExtraHeadersSync(awContents, contentsClient.getOnPageFinishedHelper(),
+                initialUrl, createHeadersMap(extraHeaders));
+        validateHeadersValue(awContents, contentsClient, extraHeaders, true);
+
+        int currentCallCount = contentsClient.getOnPageFinishedHelper().getCallCount();
+        JSUtils.clickOnLinkUsingJs(
+                this, awContents, contentsClient.getOnEvaluateJavaScriptResultHelper(), "click");
+        contentsClient.getOnPageFinishedHelper().waitForCallback(
+                currentCallCount, 1, WAIT_TIMEOUT_MS, TimeUnit.MILLISECONDS);
+        // No extra headers for the page navigated via clicking.
+        validateHeadersValue(awContents, contentsClient, extraHeaders, false);
+
+        HistoryUtils.goBackSync(getInstrumentation(), awContents.getWebContents(),
+                contentsClient.getOnPageFinishedHelper());
+        validateHeadersValue(awContents, contentsClient, extraHeaders, true);
     }
 
     private static class OnReceivedTitleClient extends TestAwContentsClient {
@@ -349,8 +283,7 @@ public class LoadUrlTest extends AwTestBase {
         final AwTestContainerView testContainerView =
                 createAwTestContainerViewOnMainSync(contentsClient);
         final AwContents awContents = testContainerView.getAwContents();
-        final AwSettings settings = getAwSettingsOnUiThread(awContents);
-        settings.setJavaScriptEnabled(true);
+        enableJavaScriptOnUiThread(awContents);
 
         contentsClient.setOnReceivedTitleCallback(new Runnable() {
             @Override