Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2054)

Issues Search
    My Issues | Starred     Open | Closed | All

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

Issue 2375133002: Move MessagePort implementation from android_webview to content (Closed)
Patch Set: rsesek nits and git cl format Created 4 years, 2 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/java/src/org/chromium/android_webview/PostMessageSender.java ('k') | android_webview/lib/main/aw_main_delegate.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: android_webview/javatests/src/org/chromium/android_webview/test/PostMessageTest.java
diff --git a/android_webview/javatests/src/org/chromium/android_webview/test/PostMessageTest.java b/android_webview/javatests/src/org/chromium/android_webview/test/PostMessageTest.java
index a5a7d8a346d5ac9d7f6543fce26897130d242d48..b5fa0b1396fb60bfa632b719c92eecc7669ca854 100644
--- a/android_webview/javatests/src/org/chromium/android_webview/test/PostMessageTest.java
+++ b/android_webview/javatests/src/org/chromium/android_webview/test/PostMessageTest.java
@@ -11,14 +11,14 @@ import android.test.suitebuilder.annotation.SmallTest;
import android.webkit.JavascriptInterface;
import org.chromium.android_webview.AwContents;
-import org.chromium.android_webview.AwMessagePort;
-import org.chromium.android_webview.AwMessagePortService;
import org.chromium.android_webview.test.util.CommonResources;
import org.chromium.base.ThreadUtils;
import org.chromium.base.annotations.SuppressFBWarnings;
import org.chromium.base.test.util.DisabledTest;
import org.chromium.base.test.util.Feature;
import org.chromium.base.test.util.RetryOnFailure;
+import org.chromium.content.browser.AppWebMessagePort;
+import org.chromium.content.browser.AppWebMessagePortService;
import org.chromium.content.browser.test.util.Criteria;
import org.chromium.content.browser.test.util.CriteriaHelper;
import org.chromium.content.browser.test.util.TestCallbackHelperContainer.OnPageFinishedHelper;
@@ -199,13 +199,13 @@ public class PostMessageTest extends AwTestBase {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- AwMessagePort[] channel = mAwContents.createMessageChannel();
- mAwContents.postMessageToFrame(null, "1", mWebServer.getBaseUrl(),
- new AwMessagePort[]{channel[1]});
+ AppWebMessagePort[] channel = mAwContents.createMessageChannel();
+ mAwContents.postMessageToFrame(
+ null, "1", mWebServer.getBaseUrl(), new AppWebMessagePort[] {channel[1]});
// Retransfer the port. This should fail with an exception.
try {
mAwContents.postMessageToFrame(null, "2", mWebServer.getBaseUrl(),
- new AwMessagePort[]{channel[1]});
+ new AppWebMessagePort[] {channel[1]});
} catch (IllegalStateException ex) {
latch.countDown();
return;
@@ -229,11 +229,11 @@ public class PostMessageTest extends AwTestBase {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- AwMessagePort[] channel = mAwContents.createMessageChannel();
+ AppWebMessagePort[] channel = mAwContents.createMessageChannel();
channel[1].postMessage("1", null);
try {
mAwContents.postMessageToFrame(null, "2", mWebServer.getBaseUrl(),
- new AwMessagePort[]{channel[1]});
+ new AppWebMessagePort[] {channel[1]});
} catch (IllegalStateException ex) {
latch.countDown();
return;
@@ -253,15 +253,15 @@ public class PostMessageTest extends AwTestBase {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- AwMessagePort[] channel = mAwContents.createMessageChannel();
+ AppWebMessagePort[] channel = mAwContents.createMessageChannel();
// set a web event handler, this puts the port in a started state.
- channel[1].setMessageCallback(new AwMessagePort.MessageCallback() {
+ channel[1].setMessageCallback(new AppWebMessagePort.MessageCallback() {
@Override
- public void onMessage(String message, AwMessagePort[] sentPorts) { }
+ public void onMessage(String message, AppWebMessagePort[] sentPorts) {}
}, null);
try {
mAwContents.postMessageToFrame(null, "2", mWebServer.getBaseUrl(),
- new AwMessagePort[]{channel[1]});
+ new AppWebMessagePort[] {channel[1]});
} catch (IllegalStateException ex) {
latch.countDown();
return;
@@ -282,11 +282,11 @@ public class PostMessageTest extends AwTestBase {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- AwMessagePort[] channel1 = mAwContents.createMessageChannel();
+ AppWebMessagePort[] channel1 = mAwContents.createMessageChannel();
channel1[1].postMessage("1", null);
- AwMessagePort[] channel2 = mAwContents.createMessageChannel();
+ AppWebMessagePort[] channel2 = mAwContents.createMessageChannel();
try {
- channel2[0].postMessage("2", new AwMessagePort[]{channel1[1]});
+ channel2[0].postMessage("2", new AppWebMessagePort[] {channel1[1]});
} catch (IllegalStateException ex) {
latch.countDown();
return;
@@ -306,15 +306,15 @@ public class PostMessageTest extends AwTestBase {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- AwMessagePort[] channel1 = mAwContents.createMessageChannel();
+ AppWebMessagePort[] channel1 = mAwContents.createMessageChannel();
// set a web event handler, this puts the port in a started state.
- channel1[1].setMessageCallback(new AwMessagePort.MessageCallback() {
+ channel1[1].setMessageCallback(new AppWebMessagePort.MessageCallback() {
@Override
- public void onMessage(String message, AwMessagePort[] sentPorts) { }
+ public void onMessage(String message, AppWebMessagePort[] sentPorts) {}
}, null);
- AwMessagePort[] channel2 = mAwContents.createMessageChannel();
+ AppWebMessagePort[] channel2 = mAwContents.createMessageChannel();
try {
- channel2[0].postMessage("1", new AwMessagePort[]{channel1[1]});
+ channel2[0].postMessage("1", new AppWebMessagePort[] {channel1[1]});
} catch (IllegalStateException ex) {
latch.countDown();
return;
@@ -341,9 +341,9 @@ public class PostMessageTest extends AwTestBase {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- AwMessagePort[] channel = mAwContents.createMessageChannel();
+ AppWebMessagePort[] channel = mAwContents.createMessageChannel();
try {
- channel[0].postMessage("1", new AwMessagePort[]{channel[0]});
+ channel[0].postMessage("1", new AppWebMessagePort[] {channel[0]});
} catch (IllegalStateException ex) {
latch.countDown();
return;
@@ -363,11 +363,11 @@ public class PostMessageTest extends AwTestBase {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- AwMessagePort[] channel = mAwContents.createMessageChannel();
+ AppWebMessagePort[] channel = mAwContents.createMessageChannel();
channel[1].close();
try {
mAwContents.postMessageToFrame(null, "1", mWebServer.getBaseUrl(),
- new AwMessagePort[]{channel[1]});
+ new AppWebMessagePort[] {channel[1]});
} catch (IllegalStateException ex) {
latch.countDown();
return;
@@ -387,11 +387,11 @@ public class PostMessageTest extends AwTestBase {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- AwMessagePort[] channel1 = mAwContents.createMessageChannel();
- AwMessagePort[] channel2 = mAwContents.createMessageChannel();
+ AppWebMessagePort[] channel1 = mAwContents.createMessageChannel();
+ AppWebMessagePort[] channel2 = mAwContents.createMessageChannel();
channel2[1].close();
try {
- channel1[0].postMessage("1", new AwMessagePort[]{channel2[1]});
+ channel1[0].postMessage("1", new AppWebMessagePort[] {channel2[1]});
} catch (IllegalStateException ex) {
latch.countDown();
return;
@@ -411,7 +411,7 @@ public class PostMessageTest extends AwTestBase {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- AwMessagePort[] channel = mAwContents.createMessageChannel();
+ AppWebMessagePort[] channel = mAwContents.createMessageChannel();
channel[0].close();
try {
channel[0].postMessage("1", null);
@@ -433,9 +433,9 @@ public class PostMessageTest extends AwTestBase {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- AwMessagePort[] channel = mAwContents.createMessageChannel();
- mAwContents.postMessageToFrame(null, "1", mWebServer.getBaseUrl(),
- new AwMessagePort[]{channel[1]});
+ AppWebMessagePort[] channel = mAwContents.createMessageChannel();
+ mAwContents.postMessageToFrame(
+ null, "1", mWebServer.getBaseUrl(), new AppWebMessagePort[] {channel[1]});
channel[0].postMessage("2", null);
channel[0].postMessage("3", null);
channel[0].close();
@@ -453,9 +453,9 @@ public class PostMessageTest extends AwTestBase {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- AwMessagePort[] channel = mAwContents.createMessageChannel();
- mAwContents.postMessageToFrame(null, "1", mWebServer.getBaseUrl(),
- new AwMessagePort[]{channel[1]});
+ AppWebMessagePort[] channel = mAwContents.createMessageChannel();
+ mAwContents.postMessageToFrame(
+ null, "1", mWebServer.getBaseUrl(), new AppWebMessagePort[] {channel[1]});
try {
channel[1].close();
} catch (IllegalStateException ex) {
@@ -477,11 +477,11 @@ public class PostMessageTest extends AwTestBase {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- AwMessagePort[] channel1 = mAwContents.createMessageChannel();
- mAwContents.postMessageToFrame(null, "1", mWebServer.getBaseUrl(),
- new AwMessagePort[]{channel1[1]});
- AwMessagePort[] channel2 = mAwContents.createMessageChannel();
- channel1[0].postMessage("2", new AwMessagePort[]{channel2[0]});
+ AppWebMessagePort[] channel1 = mAwContents.createMessageChannel();
+ mAwContents.postMessageToFrame(
+ null, "1", mWebServer.getBaseUrl(), new AppWebMessagePort[] {channel1[1]});
+ AppWebMessagePort[] channel2 = mAwContents.createMessageChannel();
+ channel1[0].postMessage("2", new AppWebMessagePort[] {channel2[0]});
try {
channel2[0].close();
} catch (IllegalStateException ex) {
@@ -505,11 +505,11 @@ public class PostMessageTest extends AwTestBase {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- AwMessagePort[] channel1 = mAwContents.createMessageChannel();
- mAwContents.postMessageToFrame(null, "1", mWebServer.getBaseUrl(),
- new AwMessagePort[]{channel1[1]});
- AwMessagePort[] channel2 = mAwContents.createMessageChannel();
- channel1[0].postMessage("2", new AwMessagePort[]{channel2[0]});
+ AppWebMessagePort[] channel1 = mAwContents.createMessageChannel();
+ mAwContents.postMessageToFrame(
+ null, "1", mWebServer.getBaseUrl(), new AppWebMessagePort[] {channel1[1]});
+ AppWebMessagePort[] channel2 = mAwContents.createMessageChannel();
+ channel1[0].postMessage("2", new AppWebMessagePort[] {channel2[0]});
}
});
expectTitle("2");
@@ -517,7 +517,7 @@ public class PostMessageTest extends AwTestBase {
private static class ChannelContainer {
private boolean mReady;
- private AwMessagePort[] mChannel;
+ private AppWebMessagePort[] mChannel;
private final Object mLock = new Object();
private String mMessage = "";
private int mCount;
@@ -531,10 +531,10 @@ public class PostMessageTest extends AwTestBase {
mWaitCount = n;
}
- public void set(AwMessagePort[] channel) {
+ public void set(AppWebMessagePort[] channel) {
mChannel = channel;
}
- public AwMessagePort[] get() {
+ public AppWebMessagePort[] get() {
return mChannel;
}
@@ -581,17 +581,17 @@ public class PostMessageTest extends AwTestBase {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- AwMessagePort[] channel = mAwContents.createMessageChannel();
+ AppWebMessagePort[] channel = mAwContents.createMessageChannel();
// verify communication from JS to Java.
channelContainer.set(channel);
- channel[0].setMessageCallback(new AwMessagePort.MessageCallback() {
+ channel[0].setMessageCallback(new AppWebMessagePort.MessageCallback() {
@Override
- public void onMessage(String message, AwMessagePort[] sentPorts) {
+ public void onMessage(String message, AppWebMessagePort[] sentPorts) {
channelContainer.setMessage(message);
}
}, null);
mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),
- new AwMessagePort[]{channel[1]});
+ new AppWebMessagePort[] {channel[1]});
}
});
mMessageObject.waitForMessage();
@@ -625,7 +625,7 @@ public class PostMessageTest extends AwTestBase {
+ "</body></html>";
// Call on non-UI thread.
- private void waitUntilPortReady(final AwMessagePort port) throws Throwable {
+ private void waitUntilPortReady(final AppWebMessagePort port) throws Throwable {
CriteriaHelper.pollUiThread(new Criteria() {
@Override
public boolean isSatisfied() {
@@ -646,10 +646,10 @@ public class PostMessageTest extends AwTestBase {
public void testMessageChannelUsingInitializedPort() throws Throwable {
final ChannelContainer channelContainer = new ChannelContainer();
loadPage(ECHO_PAGE);
- final AwMessagePort[] channel = ThreadUtils.runOnUiThreadBlocking(
- new Callable<AwMessagePort[]>() {
+ final AppWebMessagePort[] channel =
+ ThreadUtils.runOnUiThreadBlocking(new Callable<AppWebMessagePort[]>() {
@Override
- public AwMessagePort[] call() {
+ public AppWebMessagePort[] call() {
return mAwContents.createMessageChannel();
}
});
@@ -659,14 +659,14 @@ public class PostMessageTest extends AwTestBase {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- channel[0].setMessageCallback(new AwMessagePort.MessageCallback() {
+ channel[0].setMessageCallback(new AppWebMessagePort.MessageCallback() {
@Override
- public void onMessage(String message, AwMessagePort[] sentPorts) {
+ public void onMessage(String message, AppWebMessagePort[] sentPorts) {
channelContainer.setMessage(message);
}
}, null);
mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),
- new AwMessagePort[]{channel[1]});
+ new AppWebMessagePort[] {channel[1]});
channel[0].postMessage(HELLO, null);
}
});
@@ -688,15 +688,15 @@ public class PostMessageTest extends AwTestBase {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- AwMessagePort[] channel = mAwContents.createMessageChannel();
- channel[0].setMessageCallback(new AwMessagePort.MessageCallback() {
+ AppWebMessagePort[] channel = mAwContents.createMessageChannel();
+ channel[0].setMessageCallback(new AppWebMessagePort.MessageCallback() {
@Override
- public void onMessage(String message, AwMessagePort[] sentPorts) {
+ public void onMessage(String message, AppWebMessagePort[] sentPorts) {
channelContainer.setMessage(message);
}
}, null);
mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),
- new AwMessagePort[]{channel[1]});
+ new AppWebMessagePort[] {channel[1]});
channel[0].postMessage(HELLO, null);
}
});
@@ -715,10 +715,10 @@ public class PostMessageTest extends AwTestBase {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- AwMessagePort[] channel = mAwContents.createMessageChannel();
- channel[1].setMessageCallback(new AwMessagePort.MessageCallback() {
+ AppWebMessagePort[] channel = mAwContents.createMessageChannel();
+ channel[1].setMessageCallback(new AppWebMessagePort.MessageCallback() {
@Override
- public void onMessage(String message, AwMessagePort[] sentPorts) {
+ public void onMessage(String message, AppWebMessagePort[] sentPorts) {
channelContainer.setMessage(message);
}
}, null);
@@ -739,9 +739,9 @@ public class PostMessageTest extends AwTestBase {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- AwMessagePort[] channel = mAwContents.createMessageChannel();
- mAwContents.postMessageToFrame(null, "1", mWebServer.getBaseUrl(),
- new AwMessagePort[]{channel[1]});
+ AppWebMessagePort[] channel = mAwContents.createMessageChannel();
+ mAwContents.postMessageToFrame(
+ null, "1", mWebServer.getBaseUrl(), new AppWebMessagePort[] {channel[1]});
mAwContents.postMessageToFrame(null, "2", mWebServer.getBaseUrl(), null);
mAwContents.postMessageToFrame(null, "3", mWebServer.getBaseUrl(), null);
}
@@ -780,15 +780,15 @@ public class PostMessageTest extends AwTestBase {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- AwMessagePort[] channel = mAwContents.createMessageChannel();
- mAwContents.postMessageToFrame(null, "1", mWebServer.getBaseUrl(),
- new AwMessagePort[]{channel[1]});
- channel[0].setMessageCallback(new AwMessagePort.MessageCallback() {
+ AppWebMessagePort[] channel = mAwContents.createMessageChannel();
+ mAwContents.postMessageToFrame(
+ null, "1", mWebServer.getBaseUrl(), new AppWebMessagePort[] {channel[1]});
+ channel[0].setMessageCallback(new AppWebMessagePort.MessageCallback() {
@Override
- public void onMessage(String message, final AwMessagePort[] p) {
- p[0].setMessageCallback(new AwMessagePort.MessageCallback() {
+ public void onMessage(String message, final AppWebMessagePort[] p) {
+ p[0].setMessageCallback(new AppWebMessagePort.MessageCallback() {
@Override
- public void onMessage(String message, AwMessagePort[] q) {
+ public void onMessage(String message, AppWebMessagePort[] q) {
assertEquals("3", message);
p[0].postMessage("4", null);
}
@@ -801,17 +801,16 @@ public class PostMessageTest extends AwTestBase {
expectTitle("24");
}
- private static class TestMessagePort extends AwMessagePort {
-
+ private static class TestMessagePort extends AppWebMessagePort {
private boolean mReady;
- private AwMessagePort mPort;
+ private AppWebMessagePort mPort;
private final Object mLock = new Object();
- public TestMessagePort(AwMessagePortService service) {
+ public TestMessagePort(AppWebMessagePortService service) {
super(service);
}
- public void setMessagePort(AwMessagePort port) {
+ public void setMessagePort(AppWebMessagePort port) {
mPort = port;
}
@@ -847,12 +846,12 @@ public class PostMessageTest extends AwTestBase {
mPort.setMessageCallback(messageCallback, handler);
}
@Override
- public void onMessage(String message, AwMessagePort[] sentPorts) {
+ public void onMessage(String message, AppWebMessagePort[] sentPorts) {
mPort.onMessage(message, sentPorts);
}
@Override
- public void postMessage(String message, AwMessagePort[] sentPorts) throws
- IllegalStateException {
+ public void postMessage(String message, AppWebMessagePort[] sentPorts)
+ throws IllegalStateException {
mPort.postMessage(message, sentPorts);
}
}
@@ -869,15 +868,15 @@ public class PostMessageTest extends AwTestBase {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- AwMessagePort[] channel = mAwContents.createMessageChannel();
- mAwContents.postMessageToFrame(null, "1", mWebServer.getBaseUrl(),
- new AwMessagePort[]{channel[1]});
+ AppWebMessagePort[] channel = mAwContents.createMessageChannel();
+ mAwContents.postMessageToFrame(
+ null, "1", mWebServer.getBaseUrl(), new AppWebMessagePort[] {channel[1]});
mAwContents.postMessageToFrame(null, "2", mWebServer.getBaseUrl(), null);
- AwMessagePort[] channel2 = mAwContents.createMessageChannel();
+ AppWebMessagePort[] channel2 = mAwContents.createMessageChannel();
// Test port is in a pending state so it should not be transferred.
testPort.setMessagePort(channel2[0]);
- mAwContents.postMessageToFrame(null, "3", mWebServer.getBaseUrl(),
- new AwMessagePort[]{testPort});
+ mAwContents.postMessageToFrame(
+ null, "3", mWebServer.getBaseUrl(), new AppWebMessagePort[] {testPort});
}
});
expectTitle("12");
@@ -927,9 +926,9 @@ public class PostMessageTest extends AwTestBase {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- AwMessagePort[] channel = mAwContents.createMessageChannel();
+ AppWebMessagePort[] channel = mAwContents.createMessageChannel();
mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),
- new AwMessagePort[]{channel[0], channel[1]});
+ new AppWebMessagePort[] {channel[0], channel[1]});
}
});
mMessageObject.waitForMessage();
@@ -975,16 +974,16 @@ public class PostMessageTest extends AwTestBase {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- AwMessagePort[] channel = mAwContents.createMessageChannel();
+ AppWebMessagePort[] channel = mAwContents.createMessageChannel();
channelContainer.set(channel);
- channel[0].setMessageCallback(new AwMessagePort.MessageCallback() {
+ channel[0].setMessageCallback(new AppWebMessagePort.MessageCallback() {
@Override
- public void onMessage(String message, AwMessagePort[] sentPorts) {
+ public void onMessage(String message, AppWebMessagePort[] sentPorts) {
channelContainer.setMessage(message);
}
}, null);
mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),
- new AwMessagePort[] {channel[1]});
+ new AppWebMessagePort[] {channel[1]});
channel[0].postMessage(HELLO, null);
}
});
@@ -1005,16 +1004,16 @@ public class PostMessageTest extends AwTestBase {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- AwMessagePort[] channel = mAwContents.createMessageChannel();
+ AppWebMessagePort[] channel = mAwContents.createMessageChannel();
channelContainer.set(channel);
- channel[0].setMessageCallback(new AwMessagePort.MessageCallback() {
+ channel[0].setMessageCallback(new AppWebMessagePort.MessageCallback() {
@Override
- public void onMessage(String message, AwMessagePort[] sentPorts) {
+ public void onMessage(String message, AppWebMessagePort[] sentPorts) {
channelContainer.setMessage(message);
}
}, null);
mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),
- new AwMessagePort[] {channel[1]});
+ new AppWebMessagePort[] {channel[1]});
channel[0].postMessage(HELLO, null);
}
});
@@ -1046,16 +1045,16 @@ public class PostMessageTest extends AwTestBase {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- AwMessagePort[] channel = mAwContents.createMessageChannel();
+ AppWebMessagePort[] channel = mAwContents.createMessageChannel();
channelContainer.set(channel);
- channel[0].setMessageCallback(new AwMessagePort.MessageCallback() {
+ channel[0].setMessageCallback(new AppWebMessagePort.MessageCallback() {
@Override
- public void onMessage(String message, AwMessagePort[] sentPorts) {
+ public void onMessage(String message, AppWebMessagePort[] sentPorts) {
channelContainer.setMessage(message);
}
}, null);
mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),
- new AwMessagePort[] {channel[1]});
+ new AppWebMessagePort[] {channel[1]});
}
});
channelContainer.waitForMessage();
@@ -1082,16 +1081,16 @@ public class PostMessageTest extends AwTestBase {
runTestOnUiThread(new Runnable() {
@Override
public void run() {
- AwMessagePort[] channel = mAwContents.createMessageChannel();
+ AppWebMessagePort[] channel = mAwContents.createMessageChannel();
channelContainer.set(channel);
- channel[0].setMessageCallback(new AwMessagePort.MessageCallback() {
+ channel[0].setMessageCallback(new AppWebMessagePort.MessageCallback() {
@Override
- public void onMessage(String message, AwMessagePort[] sentPorts) {
+ public void onMessage(String message, AppWebMessagePort[] sentPorts) {
channelContainer.setMessage(message);
}
}, null);
mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),
- new AwMessagePort[] {channel[1]});
+ new AppWebMessagePort[] {channel[1]});
}
});
channelContainer.waitForMessage();
« no previous file with comments | « android_webview/java/src/org/chromium/android_webview/PostMessageSender.java ('k') | android_webview/lib/main/aw_main_delegate.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698