[Android] Add the bridge code to evaluate javascript code for test.

.gitignore

@@ -177,6 +177,7 @@ v8.log
 /net/testserver.log
 /out
 /out_*
+/ozone
 /ppapi/native_client/nacl_irt.xml
 /ppapi/native_client/ppapi_lib.xml
 /ppapi/native_client/src/shared/ppapi_proxy/nacl_ppapi_browser.xml
@@ -268,6 +269,7 @@ v8.log
 /third_party/jsoncpp/source
 /third_party/jsr-305/src
 /third_party/junit/src
+/third_party/khronos/CL
 /third_party/leveldatabase/src
 /third_party/leveldb
 /third_party/libaddressinput/src
@@ -323,7 +325,6 @@ v8.log
 /third_party/skia
 /third_party/smhasher
 /third_party/snappy/src
-/third_party/speex
 /third_party/swiftshader/include/
 /third_party/swig
 /third_party/syzygy
@@ -336,6 +337,7 @@ v8.log
 /third_party/v8-i18n
 /third_party/valgrind
 /third_party/v4l2capture
+/third_party/webcl
 /third_party/webdriver/pylib
 /third_party/webdriver/python/selenium
 /third_party/webgl
@@ -392,3 +394,4 @@ v8.log
 /win8/metro_driver/metro_driver_version_resources.xml
 /x86-generic_out/
 /xcodebuild
+/xwalk

android_webview/java/strings/translations/android_webview_strings_am.xtb

@@ -1,4 +1,4 @@
 <?xml version="1.0" ?>
 <!DOCTYPE translationbundle>
 <translationbundle lang="am">
-</translationbundle>
+</translationbundle>

android_webview/java/strings/translations/android_webview_strings_de.xtb

@@ -1,4 +1,4 @@
 <?xml version="1.0" ?>
 <!DOCTYPE translationbundle>
 <translationbundle lang="de">
-</translationbundle>
+</translationbundle>

android_webview/java/strings/translations/android_webview_strings_en-GB.xtb

@@ -1,4 +1,4 @@
 <?xml version="1.0" ?>
 <!DOCTYPE translationbundle>
 <translationbundle lang="en-GB">
-</translationbundle>
+</translationbundle>

android_webview/java/strings/translations/android_webview_strings_es-419.xtb

@@ -1,4 +1,4 @@
 <?xml version="1.0" ?>
 <!DOCTYPE translationbundle>
 <translationbundle lang="es-419">
-</translationbundle>
+</translationbundle>

android_webview/java/strings/translations/android_webview_strings_sw.xtb

@@ -1,4 +1,4 @@
 <?xml version="1.0" ?>
 <!DOCTYPE translationbundle>
 <translationbundle lang="sw">
-</translationbundle>
+</translationbundle>

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

@@ -34,9 +34,8 @@ private void autoLoginTestHelper(final String testName, final String xAutoLoginH
         List<Pair<String, String>> headers = new ArrayList<Pair<String, String>>();
         headers.add(Pair.create("x-auto-login", xAutoLoginHeader));
 
-        TestWebServer webServer = null;
+        TestWebServer webServer = TestWebServer.start();
         try {
-            webServer = new TestWebServer(false);
             final String pageUrl = webServer.setResponse(path, html, headers);
             final int callCount = loginRequestHelper.getCallCount();
             loadUrlAsync(awContents, pageUrl);
@@ -46,7 +45,7 @@ private void autoLoginTestHelper(final String testName, final String xAutoLoginH
             assertEquals(expectedAccount, loginRequestHelper.getAccount());
             assertEquals(expectedArgs, loginRequestHelper.getArgs());
         } finally {
-            if (webServer != null) webServer.shutdown();
+            webServer.shutdown();
         }
     }
 

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

@@ -89,7 +89,7 @@ public void onReceivedTouchIconUrl(String url, boolean precomposed) {
     protected void setUp() throws Exception {
         super.setUp();
         AwContents.setShouldDownloadFavicons();
-        mWebServer = new TestWebServer(false);
+        mWebServer = TestWebServer.start();
     }
 
     private void init(TestAwContentsClientBase contentsClient) throws Exception {

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

@@ -67,7 +67,7 @@ public void onFormResubmission(Message dontResend, Message resend) {
     @Override
     public void setUp() throws Exception {
         super.setUp();
-        mServer = new TestWebServer(false);
+        mServer = TestWebServer.start();
         mContentsClient = new TestAwContentsClient();
         final AwTestContainerView testContainerView =
                 createAwTestContainerViewOnMainSync(mContentsClient);

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

@@ -159,7 +159,7 @@ protected void setUp() throws Exception {
         mAwContents = mTestContainerView.getAwContents();
         mShouldInterceptRequestHelper = mContentsClient.getShouldInterceptRequestHelper();
 
-        mWebServer = new TestWebServer(false);
+        mWebServer = TestWebServer.start();
     }
 
     @Override

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

@@ -36,7 +36,7 @@ public class AwContentsClientShouldOverrideUrlLoadingTest extends AwTestBase {
     @Override
     protected void setUp() throws Exception {
         super.setUp();
-        mWebServer = new TestWebServer(false);
+        mWebServer = TestWebServer.start();
     }
 
     @Override

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

@@ -69,9 +69,8 @@ public void testUpdateVisitedHistoryCallback() throws Throwable {
         final String path = "/testUpdateVisitedHistoryCallback.html";
         final String html = "testUpdateVisitedHistoryCallback";
 
-        TestWebServer webServer = null;
+        TestWebServer webServer = TestWebServer.start();
         try {
-            webServer = new TestWebServer(false);
             final String pageUrl = webServer.setResponse(path, html, null);
             final DoUpdateVisitedHistoryHelper doUpdateVisitedHistoryHelper =
                 mContentsClient.getDoUpdateVisitedHistoryHelper();
@@ -88,7 +87,7 @@ public void testUpdateVisitedHistoryCallback() throws Throwable {
             assertEquals(pageUrl, doUpdateVisitedHistoryHelper.getUrl());
             assertEquals(true, doUpdateVisitedHistoryHelper.getIsReload());
         } finally {
-            if (webServer != null) webServer.shutdown();
+            webServer.shutdown();
         }
     }
 
@@ -110,9 +109,8 @@ public void testGetVisitedHistoryExerciseCodePath() throws Throwable {
         final String visitedLinks[] = {"http://foo.com", "http://bar.com", null};
         final String html = "<a src=\"http://foo.com\">foo</a><a src=\"http://bar.com\">bar</a>";
 
-        TestWebServer webServer = null;
+        TestWebServer webServer = TestWebServer.start();
         try {
-            webServer = new TestWebServer(false);
             final String pageUrl = webServer.setResponse(path, html, null);
             loadUrlSync(awContents, mContentsClient.getOnPageFinishedHelper(), pageUrl);
             visitedHistoryHelper.waitForCallback(callCount);
@@ -123,7 +121,7 @@ public void testGetVisitedHistoryExerciseCodePath() throws Throwable {
 
             loadUrlSync(awContents, mContentsClient.getOnPageFinishedHelper(), pageUrl);
         } finally {
-            if (webServer != null) webServer.shutdown();
+            webServer.shutdown();
         }
     }
 

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

@@ -254,9 +254,8 @@ public void testClearCacheMemoryAndDisk() throws Throwable {
                 createAwTestContainerViewOnMainSync(mContentsClient);
         final AwContents awContents = testContainer.getAwContents();
 
-        TestWebServer webServer = null;
+        TestWebServer webServer = TestWebServer.start();
         try {
-            webServer = new TestWebServer(false);
             final String pagePath = "/clear_cache_test.html";
             List<Pair<String, String>> headers = new ArrayList<Pair<String, String>>();
             // Set Cache-Control headers to cache this request. One century should be long enough.
@@ -296,7 +295,7 @@ public void testClearCacheMemoryAndDisk() throws Throwable {
                         pageUrl);
             assertEquals(2, webServer.getRequestCount(pagePath));
         } finally {
-            if (webServer != null) webServer.shutdown();
+            webServer.shutdown();
         }
     }
 
@@ -324,10 +323,8 @@ public void testGetFavicon() throws Throwable {
         final AwTestContainerView testView = createAwTestContainerViewOnMainSync(mContentsClient);
         final AwContents awContents = testView.getAwContents();
 
-        TestWebServer webServer = null;
+        TestWebServer webServer = TestWebServer.start();
         try {
-            webServer = new TestWebServer(false);
-
             final String faviconUrl = webServer.setResponseBase64(
                     "/" + CommonResources.FAVICON_FILENAME, CommonResources.FAVICON_DATA_BASE64,
                     CommonResources.getImagePngHeaders(false));
@@ -357,7 +354,7 @@ public Boolean call() {
             assertTrue(awContents.getFavicon().sameAs(originalFavicon));
 
         } finally {
-            if (webServer != null) webServer.shutdown();
+            webServer.shutdown();
         }
     }
 
@@ -376,9 +373,8 @@ public void testDownload() throws Throwable {
         downloadHeaders.add(Pair.create("Content-Type", mimeType));
         downloadHeaders.add(Pair.create("Content-Length", Integer.toString(data.length())));
 
-        TestWebServer webServer = null;
+        TestWebServer webServer = TestWebServer.start();
         try {
-            webServer = new TestWebServer(false);
             final String pageUrl = webServer.setResponse(
                     "/download.txt", data, downloadHeaders);
             final OnDownloadStartHelper downloadStartHelper =
@@ -392,7 +388,7 @@ public void testDownload() throws Throwable {
             assertEquals(mimeType, downloadStartHelper.getMimeType());
             assertEquals(data.length(), downloadStartHelper.getContentLength());
         } finally {
-            if (webServer != null) webServer.shutdown();
+            webServer.shutdown();
         }
     }
 
@@ -479,9 +475,8 @@ public void testCanInjectHeaders() throws Throwable {
                 createAwTestContainerViewOnMainSync(mContentsClient);
         final AwContents awContents = testContainer.getAwContents();
 
-        TestWebServer webServer = null;
+        TestWebServer webServer = TestWebServer.start();
         try {
-            webServer = new TestWebServer(false);
             final String pagePath = "/test_can_inject_headers.html";
             final String pageUrl = webServer.setResponse(
                     pagePath, "<html><body>foo</body></html>", null);
@@ -504,7 +499,7 @@ public void testCanInjectHeaders() throws Throwable {
                 assertEquals(value.getValue(), matchingHeaders[0].getValue());
             }
         } finally {
-            if (webServer != null) webServer.shutdown();
+            webServer.shutdown();
         }
     }
 

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

@@ -36,7 +36,7 @@ public void setUp() throws Exception {
         mContentsClient = new TestAwContentsClient();
         mTestView = createAwTestContainerViewOnMainSync(mContentsClient);
         mAwContents = mTestView.getAwContents();
-        mWebServer = new TestWebServer(false);
+        mWebServer = TestWebServer.start();
         mOrigin = mWebServer.getBaseUrl();
 
         AwSettings settings = getAwSettingsOnUiThread(mAwContents);