| 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 b03bc31382f91b59adbf17d985b2300a06ba3481..d2dd33c9f422a506b7ad73424088b0b86f32736c 100644
|
| --- a/content/renderer/browser_plugin/browser_plugin_browsertest.cc
|
| +++ b/content/renderer/browser_plugin/browser_plugin_browsertest.cc
|
| @@ -312,14 +312,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/";
|
| @@ -343,19 +343,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"));
|
|
|