| 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 de3be14c0f2f2e5efd0c2753ce41bb26aed1efdc..7d61143504d5c8da07bf9fc8fe54cbff4f27e5e9 100644
|
| --- a/content/renderer/browser_plugin/browser_plugin_browsertest.cc
|
| +++ b/content/renderer/browser_plugin/browser_plugin_browsertest.cc
|
| @@ -315,13 +315,13 @@ TEST_F(BrowserPluginTest, CustomEvents) {
|
| const char* kAddEventListener =
|
| "var url;"
|
| "function nav(u) {"
|
| - " url = 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/";
|
| @@ -344,12 +344,12 @@ TEST_F(BrowserPluginTest, CustomEvents) {
|
| browser_plugin_manager()->GetBrowserPlugin(instance_id));
|
| ASSERT_TRUE(browser_plugin);
|
|
|
| - browser_plugin->DidNavigate(GURL(kGoogleURL), 1337);
|
| + browser_plugin->LoadCommit(GURL(kGoogleURL), 1337, true);
|
| EXPECT_EQ(kGoogleURL, ExecuteScriptAndReturnString("url"));
|
| EXPECT_EQ(1337, ExecuteScriptAndReturnInt(kGetProcessID));
|
|
|
| ExecuteJavaScript(kRemoveEventListener);
|
| - browser_plugin->DidNavigate(GURL(kGoogleNewsURL), 42);
|
| + browser_plugin->LoadCommit(GURL(kGoogleNewsURL), 42, true);
|
| // The URL variable should not change because we've removed the event
|
| // listener.
|
| EXPECT_EQ(kGoogleURL, ExecuteScriptAndReturnString("url"));
|
|
|