Merge 32668 - Update the Mac plugin whitelist/blacklist...

webkit/glue/plugins/plugin_list_mac.mm

 // Copyright (c) 2006-2009 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 "webkit/glue/plugins/plugin_list.h"
 
 #import <Foundation/Foundation.h>
 
 #include "base/file_util.h"
 #include "base/mac_util.h"
@@ skipping 67 matching lines @@
   }
   return false;
 }
 
 bool PluginList::ShouldLoadPlugin(const WebPluginInfo& info,
                                   std::vector<WebPluginInfo>* plugins) {
   // Plugins that we know don't work at all.
   const char* blacklisted_plugin_mimes[] = {
     "application/x-director",             // Crashes during initialization.
     "application/x-googlegears",          // Safari-specific.
+    "application/x-id-quakelive",         // Crashes on load.
+    "application/x-vnd.movenetworks.qm",  // Crashes on Snow Leopard.
     "application/vnd.o3d.auto",           // Doesn't render, and having it
                                           // detected can prevent fallbacks.
   };
   // In the case of plugins that share MIME types, we have to blacklist by name.
   const char* blacklisted_plugin_names[] = {
     // Blacklisted for now since having it non-functional but trying to handle
     // PDFs is worse than not having it (PDF content would otherwise be
     // downloaded or handled by QuickTime).
     "PDF Browser Plugin",
   };
 
   // Plugins that we know are working reasonably well.
   const char* whitelisted_plugin_mimes[] = {
     "application/googletalk",
     "application/x-picasa-detect",
     "application/x-shockwave-flash",
     "application/x-silverlight",
     "application/x-webkit-test-netscape",
+    "video/quicktime",
   };
 
   // Start with names.
   std::string plugin_name = WideToUTF8(info.name);
   if (ArrayContainsString(blacklisted_plugin_names,
                           arraysize(blacklisted_plugin_names), plugin_name)) {
     return false;
   }
   // Then check mime types.
   bool whitelisted = false;
@@ skipping 23 matching lines @@
   for (size_t i = 0; i < plugins->size(); ++i) {
     if ((*plugins)[i].path.BaseName() == info.path.BaseName()) {
       return false;  // We already have a loaded plugin higher in the hierarchy.
     }
   }
 
   return true;
 }
 
 } // namespace NPAPI