android_webview/javatests/src/org/chromium/android_webview/test/AwJavaBridgeTest.java - Issue 992833002: Move minor WebViewChromium implementation to chromium layer

Unified Diff: android_webview/javatests/src/org/chromium/android_webview/test/AwJavaBridgeTest.java

Issue 992833002: Move minor WebViewChromium implementation to chromium layer (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: rename Created 5 years, 9 months ago

Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.

Jump to:

View side-by-side diff with in-line comments

Download patch

« no previous file with comments | « android_webview/javatests/src/org/chromium/android_webview/test/AwContentsTest.java ('k') | android_webview/javatests/src/org/chromium/android_webview/test/AwSettingsTest.java » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Hide Comments ('s')

Index: android_webview/javatests/src/org/chromium/android_webview/test/AwJavaBridgeTest.java

diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/AwJavaBridgeTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/AwJavaBridgeTest.java

index 329b51ca418481d7bb72991fedfcaa39aef64138..10a497432a2093189b763156bfea88847b9e7767 100644

--- a/android_webview/javatests/src/org/chromium/android_webview/test/AwJavaBridgeTest.java

+++ b/android_webview/javatests/src/org/chromium/android_webview/test/AwJavaBridgeTest.java

@@ -6,11 +6,11 @@ package org.chromium.android_webview.test;

import android.os.Build;

import android.test.suitebuilder.annotation.SmallTest;

+import android.webkit.JavascriptInterface;

import org.chromium.android_webview.AwContents;

import org.chromium.base.test.util.Feature;

import org.chromium.base.test.util.MinAndroidSdkLevel;

-import org.chromium.content.browser.JavascriptInterface;

/**

* Test suite for the WebView specific JavaBridge features.

@@ -59,7 +59,7 @@ public class AwJavaBridgeTest extends AwTestBase {

runTestOnUiThread(new Runnable() {

@Override

public void run() {

- awContents.addPossiblyUnsafeJavascriptInterface(new Test(), "test", null);

+ awContents.addJavascriptInterface(new Test(), "test");

}

});

@@ -100,8 +100,8 @@ public class AwJavaBridgeTest extends AwTestBase {

runTestOnUiThread(new Runnable() {

@Override

public void run() {

- awContents1.addPossiblyUnsafeJavascriptInterface(new Test(1), "test", null);

- awContents2.addPossiblyUnsafeJavascriptInterface(new Test(2), "test", null);

+ awContents1.addJavascriptInterface(new Test(1), "test");

+ awContents2.addJavascriptInterface(new Test(2), "test");

}

});

final String html = "<html>Hello World</html>";

@@ -136,7 +136,7 @@ public class AwJavaBridgeTest extends AwTestBase {

runTestOnUiThread(new Runnable() {

@Override

public void run() {

- awContents1.addPossiblyUnsafeJavascriptInterface(new Test(1), "test", null);

+ awContents1.addJavascriptInterface(new Test(1), "test");

}

});

final String html = "<html>Hello World</html>";

@@ -153,7 +153,7 @@ public class AwJavaBridgeTest extends AwTestBase {

runTestOnUiThread(new Runnable() {

@Override

public void run() {

- awContents2.addPossiblyUnsafeJavascriptInterface(new Test(2), "test", null);

+ awContents2.addJavascriptInterface(new Test(2), "test");

}

});

loadDataSync(awContents2, client2.getOnPageFinishedHelper(), html,