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

Unified Diff: content/browser/browser_plugin/browser_plugin_host_browsertest.cc

Issue 10829225: Browser Plugin: Add HTML5-like postMessage support (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fixed crash + cleanup Created 8 years, 3 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
Index: content/browser/browser_plugin/browser_plugin_host_browsertest.cc
diff --git a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
index 6c9a689ff2f1876091025688d5795e7ebd67b584..902ffa4b8d8cd5d8b767b889ddd1faa444b0e4e2 100644
--- a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
+++ b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc
@@ -262,7 +262,6 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, NavigateAfterResize) {
TestBrowserPluginGuest* test_guest = static_cast<TestBrowserPluginGuest*>(
test_guest_web_contents->GetBrowserPluginGuest());
-
// Wait for the guest to send an UpdateRectMsg, the dimensions should be
// 100 x 200.
ASSERT_TRUE(test_guest->WaitForUpdateRectMsgWithSize(nxt_width, nxt_height));
@@ -446,4 +445,61 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, EmbedderSameAfterNav) {
ASSERT_EQ(test_embedder_after_nav, test_embedder_);
}
+// This test verifies that round trip postMessage works as expected.
+// 1. The embedder posts a message to the guest.
+// 2. The guest receives and replies to the message using the event object's
+// source object: event.source.postMessage(...)
+// 3. The embedder receives the message and uses the event object's source
+// object to do one final reply.
+// 4. The guest receives the final 'stop' message.
+// 5. The guest acks the 'stop' message with a 'stop_ack' message.
+// 6. The embedder changes its title to 'stop_ack' when it sees the string.
+IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, PostMessage) {
+ const char* kTesting = "testing123";
+ ASSERT_TRUE(test_server()->Start());
+
+ GURL test_url(test_server()->GetURL("files/browser_plugin_embedder.html"));
+ NavigateToURL(shell(), test_url);
+
+ WebContentsImpl* embedder_web_contents = static_cast<WebContentsImpl*>(
+ shell()->web_contents());
+ RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>(
+ embedder_web_contents->GetRenderViewHost());
+
+ test_url = test_server()->GetURL(
+ "files/browser_plugin_post_message_guest.html");
+ rvh->ExecuteJavascriptAndGetValue(string16(), ASCIIToUTF16(
+ StringPrintf("SetSrc('%s');", test_url.spec().c_str())));
+
+ // Wait to make sure embedder is created/attached to WebContents.
+ ASSERT_TRUE(
+ TestBrowserPluginHostFactory::GetInstance()->WaitForEmbedderCreation());
+
+ TestBrowserPluginEmbedder* test_embedder =
+ static_cast<TestBrowserPluginEmbedder*>(
+ embedder_web_contents->GetBrowserPluginEmbedder());
+ ASSERT_TRUE(test_embedder);
+ ASSERT_TRUE(test_embedder->WaitForGuestAdded());
+
+ // Verify that we have exactly one guest.
+ const BrowserPluginEmbedder::ContainerInstanceMap& instance_map =
+ test_embedder->guest_web_contents_for_testing();
+ EXPECT_EQ(1u, instance_map.size());
+
+ WebContentsImpl* test_guest_web_contents = static_cast<WebContentsImpl*>(
+ instance_map.begin()->second);
+ TestBrowserPluginGuest* test_guest = static_cast<TestBrowserPluginGuest*>(
+ test_guest_web_contents->GetBrowserPluginGuest());
+ ASSERT_TRUE(test_guest->WaitForUpdateRectMsg());
+
+ rvh->ExecuteJavascriptAndGetValue(string16(), ASCIIToUTF16(
+ StringPrintf("PostMessage('%s');", kTesting)));
+
+ // The title will be updated to "stop_ack" if the fol
nasko 2012/09/19 21:19:59 What is "fol"?
Fady Samuel 2012/09/20 15:24:28 Done.
+ const string16 expected_title = ASCIIToUTF16("stop_ack");
+ content::TitleWatcher title_watcher(embedder_web_contents, expected_title);
+ string16 actual_title = title_watcher.WaitAndGetTitle();
+ EXPECT_EQ(expected_title, actual_title);
+}
+
} // namespace content

Powered by Google App Engine
This is Rietveld 408576698