Re-land: add support for blocking out-of-date plug-ins on Linux....

webkit/plugins/npapi/plugin_list.cc

Index: webkit/plugins/npapi/plugin_list.cc
===================================================================
--- webkit/plugins/npapi/plugin_list.cc	(revision 71010)
+++ webkit/plugins/npapi/plugin_list.cc	(working copy)
@@ -27,6 +27,18 @@
 FilePath::CharType kDefaultPluginLibraryName[] =
     FILE_PATH_LITERAL("default_plugin");
 
+// Some version ranges can be shared across operating systems. This should be
+// done where possible to avoid duplication.
+static const VersionRangeDefinition kFlashVersionRange[] = {
+    { "", "", "10.1.102" }
+};
+
+// Similarly, try and share the group definition for plug-ins that are
+// very consistent across OS'es.
+static const PluginGroupDefinition kFlashDefinition = {
+    "adobe-flash-player", "Flash", "Shockwave Flash", kFlashVersionRange,
+    arraysize(kFlashVersionRange), "http://get.adobe.com/flashplayer/" };
+
 #if defined(OS_MACOSX)
 // Plugin Groups for Mac.
 // Plugins are listed here as soon as vulnerabilities and solutions
@@ -36,11 +48,8 @@
     { "", "", "7.6.6" }
 };
 static const VersionRangeDefinition kJavaVersionRange[] = {
-    { "", "", "" }
+    { "13.0", "14.0", "13.3.0" }  // Snow Leopard
 };
-static const VersionRangeDefinition kFlashVersionRange[] = {
-    { "", "", "10.1.102" }
-};
 static const VersionRangeDefinition kSilverlightVersionRange[] = {
     { "0", "4", "3.0.50106.0" },
     { "4", "5", "" }
@@ -52,13 +61,12 @@
     { "",  "", "11.5.9.615" }
 };
 static const PluginGroupDefinition kGroupDefinitions[] = {
+  kFlashDefinition,
   { "apple-quicktime", "Quicktime", "QuickTime Plug-in", kQuicktimeVersionRange,
     arraysize(kQuicktimeVersionRange),
     "http://www.apple.com/quicktime/download/" },
   { "java-runtime-environment", "Java", "Java", kJavaVersionRange,
     arraysize(kJavaVersionRange), "http://support.apple.com/kb/HT1338" },
-  { "adobe-flash-player", "Flash", "Shockwave Flash", kFlashVersionRange,
-    arraysize(kFlashVersionRange), "http://get.adobe.com/flashplayer/" },
   { "silverlight", "Silverlight", "Silverlight", kSilverlightVersionRange,
     arraysize(kSilverlightVersionRange),
     "http://www.microsoft.com/getsilverlight/" },
@@ -84,9 +92,6 @@
     { "9", "10", "9.4.1" },
     { "0", "9", "8.2.5" }
 };
-static const VersionRangeDefinition kFlashVersionRange[] = {
-    { "", "", "10.1.102" }
-};
 static const VersionRangeDefinition kSilverlightVersionRange[] = {
     { "0", "4", "3.0.50106.0" },
     { "4", "5", "" }
@@ -98,6 +103,7 @@
     { "", "", "1.4.3.4" }
 };
 static const PluginGroupDefinition kGroupDefinitions[] = {
+  kFlashDefinition,
   { "apple-quicktime", "Quicktime", "QuickTime Plug-in", kQuicktimeVersionRange,
     arraysize(kQuicktimeVersionRange),
     "http://www.apple.com/quicktime/download/" },
@@ -106,8 +112,6 @@
   { "adobe-reader", PluginGroup::kAdobeReaderGroupName, "Adobe Acrobat",
     kAdobeReaderVersionRange, arraysize(kAdobeReaderVersionRange),
     "http://get.adobe.com/reader/" },
-  { "adobe-flash-player", "Flash", "Shockwave Flash", kFlashVersionRange,
-    arraysize(kFlashVersionRange), "http://get.adobe.com/flashplayer/" },
   { "silverlight", "Silverlight", "Silverlight", kSilverlightVersionRange,
     arraysize(kSilverlightVersionRange),
     "http://www.microsoft.com/getsilverlight/" },
@@ -131,7 +135,26 @@
 };
 
 #else
-static const PluginGroupDefinition kGroupDefinitions[] = {};
+static const VersionRangeDefinition kJavaVersionRange[] = {
+    { "0", "1.7", "1.6.0.22" }
+};
+
+static const VersionRangeDefinition kRedhatIcedTeaVersionRange[] = {
+    { "0", "1.9", "1.8.3" },
+    { "1.9", "1.10", "1.9.2" },
+};
+
+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,
+    arraysize(kRedhatIcedTeaVersionRange),
+    "http://www.linuxsecurity.com/content/section/3/170/" },
+};
 #endif
 
 // static