android_webview/javatests/src/org/chromium/android_webview/test/PostMessageTest.java - Issue 923913004: Use an empty origin as source origin when posting messages from android_webview

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

Issue 923913004: Use an empty origin as source origin when posting messages from android_webview (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master

Patch Set: Created 5 years, 10 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/native/aw_contents.h » ('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/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 cbc58441961a1c4baf909aa827429d7b1f3f45f1..1e61bd9e48eb8a7ffd97f1eb655147bfc3c022af 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

@@ -31,7 +31,7 @@ import java.util.concurrent.CountDownLatch;

@MinAndroidSdkLevel(Build.VERSION_CODES.KITKAT)

public class PostMessageTest extends AwTestBase {

- private static final String SOURCE_ORIGIN = "android_webview";

+ private static final String SOURCE_ORIGIN = "";

// Timeout to failure, in milliseconds

private static final long TIMEOUT = scaleTimeout(5000);

@@ -138,8 +138,8 @@ public class PostMessageTest extends AwTestBase {

runTestOnUiThread(new Runnable() {

@Override

public void run() {

- mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, SOURCE_ORIGIN,

- mWebServer.getBaseUrl(), null);

+ mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),

+ null);

}

});

mMessageObject.waitForMessage();

@@ -156,12 +156,12 @@ public class PostMessageTest extends AwTestBase {

@Override

public void run() {

MessagePort[] channel = mAwContents.createMessageChannel();

- mAwContents.postMessageToFrame(null, "1", SOURCE_ORIGIN,

- mWebServer.getBaseUrl(), new MessagePort[]{channel[1]});

+ mAwContents.postMessageToFrame(null, "1", mWebServer.getBaseUrl(),

+ new MessagePort[]{channel[1]});

// Retransfer the port. This should fail with an exception.

try {

- mAwContents.postMessageToFrame(null, "2", SOURCE_ORIGIN,

- mWebServer.getBaseUrl(), new MessagePort[]{channel[1]});

+ mAwContents.postMessageToFrame(null, "2", mWebServer.getBaseUrl(),

+ new MessagePort[]{channel[1]});

} catch (IllegalStateException ex) {

latch.countDown();

return;

@@ -212,8 +212,8 @@ public class PostMessageTest extends AwTestBase {

MessagePort[] channel = mAwContents.createMessageChannel();

channel[1].close();

try {

- mAwContents.postMessageToFrame(null, "1", SOURCE_ORIGIN,

- mWebServer.getBaseUrl(), new MessagePort[]{channel[1]});

+ mAwContents.postMessageToFrame(null, "1", mWebServer.getBaseUrl(),

+ new MessagePort[]{channel[1]});

} catch (IllegalStateException ex) {

latch.countDown();

return;

@@ -328,8 +328,8 @@ public class PostMessageTest extends AwTestBase {

channelContainer.setMessage(message);

}

});

- mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, SOURCE_ORIGIN,

- mWebServer.getBaseUrl(), new MessagePort[]{channel[1]});

+ mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),

+ new MessagePort[]{channel[1]});

}

});

mMessageObject.waitForMessage();

@@ -410,8 +410,8 @@ public class PostMessageTest extends AwTestBase {

channelContainer.setMessage(message);

}

});

- mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, SOURCE_ORIGIN,

- mWebServer.getBaseUrl(), new MessagePort[]{channel[1]});

+ mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),

+ new MessagePort[]{channel[1]});

channel[0].postMessage(HELLO, null);

}

});

@@ -440,8 +440,8 @@ public class PostMessageTest extends AwTestBase {

channelContainer.setMessage(message);

}

});

- mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, SOURCE_ORIGIN,

- mWebServer.getBaseUrl(), new MessagePort[]{channel[1]});

+ mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),

+ new MessagePort[]{channel[1]});

channel[0].postMessage(HELLO, null);

}

});

@@ -515,12 +515,10 @@ public class PostMessageTest extends AwTestBase {

@Override

public void run() {

MessagePort[] channel = mAwContents.createMessageChannel();

- mAwContents.postMessageToFrame(null, "1", SOURCE_ORIGIN,

- mWebServer.getBaseUrl(), new MessagePort[]{channel[1]});

- mAwContents.postMessageToFrame(null, "2", SOURCE_ORIGIN,

- mWebServer.getBaseUrl(), null);

- mAwContents.postMessageToFrame(null, "3", SOURCE_ORIGIN,

- mWebServer.getBaseUrl(), null);

+ mAwContents.postMessageToFrame(null, "1", mWebServer.getBaseUrl(),

+ new MessagePort[]{channel[1]});

+ mAwContents.postMessageToFrame(null, "2", mWebServer.getBaseUrl(), null);

+ mAwContents.postMessageToFrame(null, "3", mWebServer.getBaseUrl(), null);

}

});

expectTitle("123");

@@ -595,15 +593,14 @@ public class PostMessageTest extends AwTestBase {

@Override

public void run() {

MessagePort[] channel = mAwContents.createMessageChannel();

- mAwContents.postMessageToFrame(null, "1", SOURCE_ORIGIN,

- mWebServer.getBaseUrl(), new MessagePort[]{channel[1]});

- mAwContents.postMessageToFrame(null, "2", SOURCE_ORIGIN,

- mWebServer.getBaseUrl(), null);

+ mAwContents.postMessageToFrame(null, "1", mWebServer.getBaseUrl(),

+ new MessagePort[]{channel[1]});

+ mAwContents.postMessageToFrame(null, "2", mWebServer.getBaseUrl(), null);

MessagePort[] channel2 = mAwContents.createMessageChannel();

// Test port is in a pending state so it should not be transferred.

testPort.setMessagePort(channel2[0]);

- mAwContents.postMessageToFrame(null, "3", SOURCE_ORIGIN,

- mWebServer.getBaseUrl(), new MessagePort[]{testPort});

+ mAwContents.postMessageToFrame(null, "3", mWebServer.getBaseUrl(),

+ new MessagePort[]{testPort});

}

});

expectTitle("12");

@@ -653,8 +650,8 @@ public class PostMessageTest extends AwTestBase {

@Override

public void run() {

MessagePort[] channel = mAwContents.createMessageChannel();

- mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, SOURCE_ORIGIN,

- mWebServer.getBaseUrl(), new MessagePort[]{channel[0], channel[1]});

+ mAwContents.postMessageToFrame(null, WEBVIEW_MESSAGE, mWebServer.getBaseUrl(),

+ new MessagePort[]{channel[0], channel[1]});

}

});

mMessageObject.waitForMessage();