Chromium Code Reviews| 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 703a4f9e894ce006e34f8cb50df369202d02aa0e..e4959083829fa200db94cfda353958af1432ca49 100644 |
| --- a/content/browser/browser_plugin/browser_plugin_host_browsertest.cc |
| +++ b/content/browser/browser_plugin/browser_plugin_host_browsertest.cc |
| @@ -709,4 +709,44 @@ IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, LoadRedirect) { |
| EXPECT_EQ(test_server()->GetURL("files/title1.html").spec().c_str(), result); |
| } |
| +IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, LoadStop) { |
| + const char* kEmbedderURL = "files/browser_plugin_embedder.html"; |
| + StartBrowserPluginTest(kEmbedderURL, "about:blank", true, ""); |
| + |
| + const string16 expected_title = ASCIIToUTF16("loadStop"); |
| + content::TitleWatcher title_watcher( |
| + test_embedder()->web_contents(), expected_title); |
| + // Renavigate the guest to |kHTMLForGuest|. |
| + RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>( |
| + test_embedder()->web_contents()->GetRenderViewHost()); |
| + rvh->ExecuteJavascriptAndGetValue(string16(), ASCIIToUTF16( |
| + StringPrintf("SetSrc('%s');", kHTMLForGuest))); |
| + |
| + string16 actual_title = title_watcher.WaitAndGetTitle(); |
| + EXPECT_EQ(expected_title, actual_title); |
| +} |
| + |
| +IN_PROC_BROWSER_TEST_F(BrowserPluginHostTest, LoadCommit) { |
| + const char* kEmbedderURL = "files/browser_plugin_embedder.html"; |
| + StartBrowserPluginTest(kEmbedderURL, "about:blank", true, ""); |
| + |
| + const string16 expected_prefix = ASCIIToUTF16("loadCommit:"); |
| + const string16 expected_title = expected_prefix+ASCIIToUTF16(kHTMLForGuest); |
|
Charlie Reis
2012/10/11 21:56:33
I would suggest StringPrintf on "loadCommit:%s" in
irobert
2012/10/15 19:51:40
Done.
|
| + content::TitleWatcher title_watcher( |
| + test_embedder()->web_contents(), expected_title); |
| + // Renavigate the guest to |kHTMLForGuest|. |
| + RenderViewHostImpl* rvh = static_cast<RenderViewHostImpl*>( |
| + test_embedder()->web_contents()->GetRenderViewHost()); |
| + rvh->ExecuteJavascriptAndGetValue(string16(), ASCIIToUTF16( |
| + StringPrintf("SetSrc('%s');", kHTMLForGuest))); |
| + |
| + string16 actual_title = title_watcher.WaitAndGetTitle(); |
| + EXPECT_EQ(expected_title, actual_title); |
| + base::Value* isTopLevel = rvh->ExecuteJavascriptAndGetValue( |
| + string16(), ASCIIToUTF16("commitIsTopLevel")); |
| + bool t; |
| + EXPECT_TRUE(isTopLevel->GetAsBoolean(&t)); |
| + EXPECT_EQ(true, t); |
| +} |
| + |
| } // namespace content |