Add Java support directory to plugin lookup list on 10.5

webkit/plugins/npapi/plugin_list_mac.mm

Index: webkit/plugins/npapi/plugin_list_mac.mm
diff --git a/webkit/plugins/npapi/plugin_list_mac.mm b/webkit/plugins/npapi/plugin_list_mac.mm
index 802ea3e5e077a20006e3cd4522eb25a451cb1974..597cb8dfde6ad1bd09c5dcbba99e755ce393d47a 100644
--- a/webkit/plugins/npapi/plugin_list_mac.mm
+++ b/webkit/plugins/npapi/plugin_list_mac.mm
@@ -74,6 +74,14 @@ void PluginList::GetPluginDirectories(std::vector<FilePath>* plugin_dirs) {
 
   // Load from the machine-wide area
   GetPluginCommonDirectory(plugin_dirs, false);
+
+  // 10.5 includes the Java2 plugin, but no longer has a symlink to it in

[Mark Mentovai, 2011/08/09 16:46:44]

Can you make the comment a bit more specific? This isn’t a property of 10.5 per
se, it’s a property of “Java for Mac OS X 10.5 Update 10.”

You may want to refer directly to
http://developer.apple.com/library/mac/#releasenotes/Java/JavaSnowLeopardUpda...

[stuartmorgan1, 2011/08/10 11:10:44]

Done.

+  // the Internet Plug-Ins directory. Manually include it since there's no
+  // other way to support Java.
+  if (base::mac::IsOSLeopard()) {
+    plugin_dirs->push_back(FilePath(
+        "/System/Library/Java/Support/Deploy.bundle/Contents/Resources/"));

[Mark Mentovai, 2011/08/09 16:46:44]

Any reason for the trailing slash? This works just fine without it.

[stuartmorgan1, 2011/08/10 11:10:44]

Just copy/paste from terminal autocomplete. Removed.

+  }
 }
 
 void PluginList::LoadPluginsFromDir(const FilePath &path,