Add loadCommit and loadStop Event

content/renderer/browser_plugin/browser_plugin_browsertest.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "content/renderer/browser_plugin/browser_plugin_browsertest.h"
 
 #include "base/file_path.h"
 #include "base/file_util.h"
 #include "base/path_service.h"
 #include "content/common/browser_plugin_messages.h"
@@ skipping 294 matching lines @@
   ExecuteJavaScript("x = document.getElementById('browserplugin'); "
                     "x.parentNode.removeChild(x);");
   ProcessPendingMessages();
   EXPECT_TRUE(browser_plugin_manager()->sink().GetUniqueMessageMatching(
       BrowserPluginHostMsg_PluginDestroyed::ID));
 }
 
 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/";
   const char* kGoogleNewsURL = "http://news.google.com/";
 
   LoadHTML(GetHTMLForBrowserPluginObject().c_str());
   ExecuteJavaScript(kAddEventListener);
   // Grab the BrowserPlugin's instance ID from its resize message.
   const IPC::Message* msg =
       browser_plugin_manager()->sink().GetFirstMessageMatching(
           BrowserPluginHostMsg_ResizeGuest::ID);
   ASSERT_TRUE(msg);
   PickleIterator iter = IPC::SyncMessage::GetDataIterator(msg);
   BrowserPluginHostMsg_ResizeGuest::SendParam  resize_params;
   ASSERT_TRUE(IPC::ReadParam(msg, &iter, &resize_params));
   int instance_id = resize_params.a;
 
   MockBrowserPlugin* browser_plugin =
       static_cast<MockBrowserPlugin*>(
           browser_plugin_manager()->GetBrowserPlugin(instance_id));
   ASSERT_TRUE(browser_plugin);
 
-  {
-    BrowserPluginMsg_DidNavigate_Params navigate_params;
-    navigate_params.url = GURL(kGoogleURL);
-    navigate_params.process_id = 1337;
-    browser_plugin->DidNavigate(navigate_params);
-    EXPECT_EQ(kGoogleURL, ExecuteScriptAndReturnString("url"));
-    EXPECT_EQ(1337, ExecuteScriptAndReturnInt(kGetProcessID));
-  }
+  browser_plugin->LoadCommit(GURL(kGoogleURL), 1337, true);
+  EXPECT_EQ(kGoogleURL, ExecuteScriptAndReturnString("url"));
+  EXPECT_EQ(1337, ExecuteScriptAndReturnInt(kGetProcessID));
+
   ExecuteJavaScript(kRemoveEventListener);
-  {
-    BrowserPluginMsg_DidNavigate_Params navigate_params;
-    navigate_params.url = GURL(kGoogleNewsURL);
-    navigate_params.process_id = 42;
-    browser_plugin->DidNavigate(navigate_params);
-    // The URL variable should not change because we've removed the event
-    // listener.
-    EXPECT_EQ(kGoogleURL, ExecuteScriptAndReturnString("url"));
-    EXPECT_EQ(42, ExecuteScriptAndReturnInt(kGetProcessID));
-  }
+  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"));
+  EXPECT_EQ(42, ExecuteScriptAndReturnInt(kGetProcessID));
 }
 
 TEST_F(BrowserPluginTest, StopMethod) {
   const char* kCallStop =
     "document.getElementById('browserplugin').stop();";
   LoadHTML(GetHTMLForBrowserPluginObject().c_str());
   ExecuteJavaScript(kCallStop);
   EXPECT_TRUE(browser_plugin_manager()->sink().GetUniqueMessageMatching(
       BrowserPluginHostMsg_Stop::ID));
 }
@@ skipping 116 matching lines @@
   EXPECT_STREQ(
       "The object has already navigated, so its partition cannot be changed.",
       title.c_str());
 
   partition_value = ExecuteScriptAndReturnString(
       "document.getElementById('browserplugin').partition");
   EXPECT_STREQ("storage", partition_value.c_str());
 }
 
 }  // namespace content