browser-plugin: Remove event handling code, and use CustomEvents in webkit instead.

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 256 matching lines @@
   // Send an event and verify that the event is deported.
   browser_plugin->handleInputEvent(WebKit::WebMouseEvent(),
                                    cursor_info);
   EXPECT_TRUE(browser_plugin_manager()->sink().GetUniqueMessageMatching(
       BrowserPluginHostMsg_HandleInputEvent::ID));
   browser_plugin_manager()->sink().ClearMessages();
 
   const char* kAddEventListener =
     "var msg;"
     "function exitListener(e) {"
-    "  msg = e.type;"
+    "  msg = e.detail.reason;"
     "}"
     "document.getElementById('browserplugin')."
-    "    addEventListener('exit', exitListener);";
+    "    addEventListener('-internal-exit', exitListener);";
 
   ExecuteJavaScript(kAddEventListener);
 
   // Pretend that the guest has terminated normally.
   browser_plugin->GuestGone(0, base::TERMINATION_STATUS_NORMAL_TERMINATION);
 
   // Verify that our event listener has fired.
   EXPECT_EQ("normal", ExecuteScriptAndReturnString("msg"));
 
   // Pretend that the guest has crashed.
@@ skipping 17 matching lines @@
                     "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(u) {"
-    "  url = u.url;"
+    "  url = u.detail.url;"
     "}"
     "document.getElementById('browserplugin')."
-    "    addEventListener('loadcommit', nav);";
+    "    addEventListener('-internal-loadcommit', nav);";
   const char* kRemoveEventListener =
     "document.getElementById('browserplugin')."
-    "    removeEventListener('loadcommit', nav);";
+    "    removeEventListener('-internal-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(
@@ skipping 160 matching lines @@
       "document.getElementById('browserplugin').partition");
   EXPECT_STREQ("storage", partition_value.c_str());
 }
 
 // This test verifies that we can mutate the event listener vector
 // within an event listener.
 TEST_F(BrowserPluginTest, RemoveEventListenerInEventListener) {
   const char* kAddEventListener =
     "var url;"
     "function nav(u) {"
-    "  url = u.url;"
+    "  url = u.detail.url;"
     "  document.getElementById('browserplugin')."
-    "      removeEventListener('loadcommit', nav);"
+    "      removeEventListener('-internal-loadcommit', nav);"
     "}"
     "document.getElementById('browserplugin')."
-    "    addEventListener('loadcommit', nav);";
+    "    addEventListener('-internal-loadcommit', nav);";
   const char* kGoogleURL = "http://www.google.com/";
   const char* kGoogleNewsURL = "http://news.google.com/";
   const char* kGetProcessID =
       "document.getElementById('browserplugin').getProcessId()";
 
   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(
@@ skipping 34 matching lines @@
 TEST_F(BrowserPluginTest, MultipleEventListeners) {
   const char* kAddEventListener =
     "var count = 0;"
     "function nava(u) {"
     "  count++;"
     "}"
     "function navb(u) {"
     "  count++;"
     "}"
     "document.getElementById('browserplugin')."
-    "    addEventListener('loadcommit', nava);"
+    "    addEventListener('-internal-loadcommit', nava);"
     "document.getElementById('browserplugin')."
-    "    addEventListener('loadcommit', navb);";
+    "    addEventListener('-internal-loadcommit', navb);";
   const char* kGoogleURL = "http://www.google.com/";
   const char* kGetProcessID =
       "document.getElementById('browserplugin').getProcessId()";
 
   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);
@@ skipping 31 matching lines @@
   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);
 
   const char* kAddEventListener =
     "function exitListener(e) {"
-    "  if (e.type == 'killed') {"
+    "  if (e.detail.reason == 'killed') {"
     "    var bp = document.getElementById('browserplugin');"
     "    bp.parentNode.removeChild(bp);"
     "  }"
     "}"
     "document.getElementById('browserplugin')."
-    "    addEventListener('exit', exitListener);";
+    "    addEventListener('-internal-exit', exitListener);";
 
   ExecuteJavaScript(kAddEventListener);
 
   // Pretend that the guest has crashed.
   browser_plugin->GuestGone(0, base::TERMINATION_STATUS_PROCESS_WAS_KILLED);
 
   ProcessPendingMessages();
 
   EXPECT_EQ(NULL, browser_plugin_manager()->GetBrowserPlugin(instance_id));
 }
@@ skipping 54 matching lines @@
         &params);
      EXPECT_FALSE(params.enable);
      EXPECT_EQ(42, params.min_width);
      EXPECT_EQ(43, params.min_height);
      EXPECT_EQ(1337, params.max_width);
      EXPECT_EQ(1338, params.max_height);
   }
 }
 
 }  // namespace content