Don't load the Java plugin prior to update 12, since they don't work in Chrom...

webkit/glue/plugins/plugin_list_win.cc

Index: webkit/glue/plugins/plugin_list_win.cc
===================================================================
--- webkit/glue/plugins/plugin_list_win.cc	(revision 31079)
+++ webkit/glue/plugins/plugin_list_win.cc	(working copy)
@@ -317,6 +317,21 @@
   if (filename == kWanWangProtocolHandlerPlugin)
     return false;
 
+  // We only work with newer versions of the Java plugin which use NPAPI only
+  // and don't depend on XPCOM.
+  if (filename == kJavaPlugin1 || filename == kJavaPlugin2) {
+    std::vector<std::wstring> ver;
+    SplitString(info.version, '.', &ver);
+    int major, minor, update;
+    if (ver.size() == 4 &&
+        StringToInt(ver[0], &major) &&
+        StringToInt(ver[1], &minor) &&
+        StringToInt(ver[2], &update)) {
+      if (major == 6 && minor == 0 && update < 120)

[Peter Kasting, 2009/11/05 23:27:16]

Shouldn't this be:
if ((major < 6) || ((major == 6) && (minor == 0) && (update < 120)))
?

+        return false;  // Java SE6 Update 12 or older.

[Peter Kasting, 2009/11/05 23:27:16]

This comment doesn't match the code, does it?  In the code you're bailing on
"older than U12" but here you claim you're bailing on "U12 or older".  Which is
the right behavior?

+    }
+  }
+
   // Special WMP handling
 
   // If both the new and old WMP plugins exist, only load the new one.