[Android] Switch to Gin Java Bridge implementation

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

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
index 38bfbd1adc7554bb1ef5168198785e06ddc742ac..db9f5f9017c4a8dac7204074e8829fee5babaa27 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java
@@ -1938,7 +1938,7 @@ public class AwSettingsTest extends AwTestBase {
                 createAwTestContainerViewOnMainSync(contentClient);
         final AwContents awContents = testContainer.getAwContents();
         final AwSettings awSettings = getAwSettingsOnUiThread(awContents);
-        CallbackHelper callback = new CallbackHelper();
+        final CallbackHelper callback = new CallbackHelper();
         awSettings.setJavaScriptEnabled(true);
 
         TestWebServer webServer = null;
@@ -1954,8 +1954,13 @@ public class AwSettingsTest extends AwTestBase {
                     "onerror=\"AudioEvent.onError();\" /> </body></html>";
             // Actual test. Blocking should trigger onerror handler.
             awSettings.setBlockNetworkLoads(true);
-            awContents.addPossiblyUnsafeJavascriptInterface(
-                    new AudioEvent(callback), "AudioEvent", null);
+            runTestOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    awContents.addPossiblyUnsafeJavascriptInterface(
+                            new AudioEvent(callback), "AudioEvent", null);
+                }
+            });
             int count = callback.getCallCount();
             loadDataSync(awContents, contentClient.getOnPageFinishedHelper(), pageHtml,
                     "text/html", false);