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

webkit/glue/plugins/plugin_list_win.cc

 // Copyright (c) 2006-2008 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 <tchar.h>
 
 #include "webkit/glue/plugins/plugin_list.h"
 
 #include "base/basictypes.h"
 #include "base/command_line.h"
@@ skipping 299 matching lines @@
   if (filename == kYahooApplicationStatePlugin)
     return false;
 
   // Disable the WangWang protocol handler plugin (npww.dll) as it crashes
   // chrome during shutdown. Firefox also disables this plugin.
   // Please refer to http://code.google.com/p/chromium/issues/detail?id=3953
   // for more information.
   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.
   if (filename == kNewWMPPlugin) {
     if (dont_load_new_wmp_)
       return false;
 
     for (size_t i = 0; i < plugins->size(); ++i) {
       if ((*plugins)[i].path.BaseName().value() == kOldWMPPlugin) {
         plugins->erase(plugins->begin() + i);
         break;
       }
     }
   } else if (filename == kOldWMPPlugin) {
     for (size_t i = 0; i < plugins->size(); ++i) {
       if ((*plugins)[i].path.BaseName().value() == kNewWMPPlugin)
         return false;
     }
   }
 
   return true;
 }
 
 } // namespace NPAPI