Disable support for the Mac NPAPI Carbon event model

webkit/plugins/npapi/webplugin_delegate_impl_mac.mm

Index: webkit/plugins/npapi/webplugin_delegate_impl_mac.mm
diff --git a/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm b/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm
index dd7c9c7f6acf0f68fd35a561b8b1d85e99d57814..35d3f719a7247612c8b6126c767788a00bce66d5 100644
--- a/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm
+++ b/webkit/plugins/npapi/webplugin_delegate_impl_mac.mm
@@ -322,6 +322,15 @@ bool WebPluginDelegateImpl::PlatformInitialize() {
 
 #ifndef NP_NO_CARBON
   if (instance()->event_model() == NPEventModelCarbon) {
+    // Carbon is no longer supported, but the test plugin has not yet been
+    // updated; allow the test plugin to continue, but kill any other plugin
+    // that tries to use Carbon.
+    // TODO(stuartmorgan): Remove all Carbon support once crbug.com/134359 is
+    // fixed.
+    const WebPluginInfo& plugin_info = instance_->plugin_lib()->plugin_info();
+    if (plugin_info.name != ASCIIToUTF16("Chromium NPAPI Test Plugin"))
+      return false;
+
     // Create a stand-in for the browser window so that the plugin will have
     // a non-NULL WindowRef to which it can refer.
     CarbonPluginWindowTracker* window_tracker =