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

Unified Diff: content/renderer/browser_plugin/browser_plugin_browsertest.cc

Issue 11035067: Add loadCommit and loadStop Event (Closed) Base URL: svn://svn.chromium.org/chrome/trunk/src
Patch Set: Fix Comments Created 8 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
Index: content/renderer/browser_plugin/browser_plugin_browsertest.cc
diff --git a/content/renderer/browser_plugin/browser_plugin_browsertest.cc b/content/renderer/browser_plugin/browser_plugin_browsertest.cc
index 6ab316a2491178413a3e41ceca5f026ce7144cb6..9a053865d4d0aec2f43fb8f02029c873dd82c541 100644
--- a/content/renderer/browser_plugin/browser_plugin_browsertest.cc
+++ b/content/renderer/browser_plugin/browser_plugin_browsertest.cc
@@ -308,14 +308,14 @@ TEST_F(BrowserPluginTest, RemovePlugin) {
TEST_F(BrowserPluginTest, CustomEvents) {
const char* kAddEventListener =
"var url;"
- "function nav(e) {"
- " url = e.url;"
+ "function nav(u) {"
+ " url = u.url;"
"}"
"document.getElementById('browserplugin')."
- " addEventListener('navigation', nav);";
+ " addEventListener('loadCommit', nav);";
const char* kRemoveEventListener =
"document.getElementById('browserplugin')."
- " removeEventListener('navigation', nav);";
+ " removeEventListener('loadCommit', nav);";
const char* kGetProcessID =
"document.getElementById('browserplugin').getProcessId()";
const char* kGoogleURL = "http://www.google.com/";
@@ -339,19 +339,19 @@ TEST_F(BrowserPluginTest, CustomEvents) {
ASSERT_TRUE(browser_plugin);
{
- BrowserPluginMsg_DidNavigate_Params navigate_params;
+ BrowserPluginMsg_LoadCommit_Params navigate_params;
navigate_params.url = GURL(kGoogleURL);
navigate_params.process_id = 1337;
- browser_plugin->DidNavigate(navigate_params);
+ browser_plugin->LoadCommit(navigate_params);
EXPECT_EQ(kGoogleURL, ExecuteScriptAndReturnString("url"));
EXPECT_EQ(1337, ExecuteScriptAndReturnInt(kGetProcessID));
}
ExecuteJavaScript(kRemoveEventListener);
{
- BrowserPluginMsg_DidNavigate_Params navigate_params;
+ BrowserPluginMsg_LoadCommit_Params navigate_params;
navigate_params.url = GURL(kGoogleNewsURL);
navigate_params.process_id = 42;
- browser_plugin->DidNavigate(navigate_params);
+ browser_plugin->LoadCommit(navigate_params);
// The URL variable should not change because we've removed the event
// listener.
EXPECT_EQ(kGoogleURL, ExecuteScriptAndReturnString("url"));

Powered by Google App Engine
This is Rietveld 408576698