Manual merge of updated IcedTea versions from trunk....

webkit/plugins/npapi/plugin_list.cc

 // Copyright (c) 2010 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/plugins/npapi/plugin_list.h"
 
 #include <algorithm>
 
 #include "base/command_line.h"
 #include "base/lazy_instance.h"
@@ skipping 120 matching lines @@
   { "microsoft-office", "Microsoft Office", "Microsoft Office",
     NULL, 0, "" },
 };
 
 #else
 static const VersionRangeDefinition kJavaVersionRange[] = {
     { "0", "1.7", "1.6.0.24" }
 };
 
 static const VersionRangeDefinition kRedhatIcedTeaVersionRange[] = {
-    { "0", "1.9", "1.8.5" },
-    { "1.9", "1.10", "1.9.5" },
+    { "0", "1.9", "1.8.7" },
+    { "1.9", "1.10", "1.9.7" },
 };
 
 static const PluginGroupDefinition kGroupDefinitions[] = {
   // Flash on Linux is significant because there isn't yet a built-in Flash
   // plug-in on the Linux 64-bit version of Chrome.
   kFlashDefinition,
   { "java-runtime-environment", "Java 6", "Java", kJavaVersionRange,
     arraysize(kJavaVersionRange),
     "http://www.java.com/en/download/manual.jsp" },
   { "redhat-icetea-java", "IcedTea", "IcedTea", kRedhatIcedTeaVersionRange,
@@ skipping 672 matching lines @@
 void PluginList::DisableOutdatedPluginGroups() {
   disable_outdated_plugins_ = true;
 }
 
 PluginList::~PluginList() {
 }
 
 
 }  // namespace npapi
 }  // namespace webkit