Merge a bunch of CLs to whitelist the Google Talk plug-in when turning on click-to-play.

webkit/plugins/npapi/plugin_list.cc

Index: webkit/plugins/npapi/plugin_list.cc
diff --git a/webkit/plugins/npapi/plugin_list.cc b/webkit/plugins/npapi/plugin_list.cc
index 014fe862ac8ae306f0968fb4232123ba1dedddd2..307581534dd35634455bdae761cdbcabe9127741 100644
--- a/webkit/plugins/npapi/plugin_list.cc
+++ b/webkit/plugins/npapi/plugin_list.cc
@@ -55,6 +55,16 @@ namespace npapi {
 
 // Some version ranges can be shared across operating systems. This should be
 // done where possible to avoid duplication.
+// TODO(bauerb): The |requires_authorization| flag should be part of
+// PluginGroupDefinition, not VersionRangeDefinition.
+static const VersionRangeDefinition kAllVersionsInfobarVersionRange[] = {
+    { "", "", "", true }
+};
+
+static const VersionRangeDefinition kAllVersionsNoInfobarVersionRange[] = {
+    { "", "", "", false }
+};
+
 // This is up to date with
 // http://www.adobe.com/support/security/bulletins/apsb11-26.html
 static const VersionRangeDefinition kFlashVersionRange[] = {
@@ -86,6 +96,16 @@ static const VersionRangeDefinition kSilverlightVersionRange[] = {
     kSilverlightVersionRange, arraysize(kSilverlightVersionRange), \
     "http://www.microsoft.com/getsilverlight/" }
 
+#define kChromePdfDefinition { \
+    "google-chrome-pdf", "Chrome PDF Viewer", "Chrome PDF Viewer", \
+    kAllVersionsNoInfobarVersionRange, \
+    arraysize(kAllVersionsNoInfobarVersionRange), "" }
+
+#define kGoogleTalkDefinition { \
+    "google-talk", "Google Talk NPAPI Plugin", "Google Talk NPAPI Plugin", \
+    kAllVersionsNoInfobarVersionRange, \
+    arraysize(kAllVersionsNoInfobarVersionRange), ""}
+
 #if defined(OS_MACOSX)
 // Plugin Groups for Mac.
 // Plugins are listed here as soon as vulnerabilities and solutions
@@ -115,7 +135,9 @@ static const PluginGroupDefinition kGroupDefinitions[] = {
   { "flip4mac", "Flip4Mac", "Flip4Mac", kFlip4MacVersionRange,
     arraysize(kFlip4MacVersionRange),
     "http://www.telestream.net/flip4mac-wmv/overview.htm" },
-  kShockwaveDefinition
+  kShockwaveDefinition,
+  kChromePdfDefinition,
+  kGoogleTalkDefinition,
 };
 
 #elif defined(OS_WIN)
@@ -141,12 +163,6 @@ static const VersionRangeDefinition kDivXVersionRange[] = {
 static const VersionRangeDefinition kRealPlayerVersionRange[] = {
     { "", "", "12.0.1.666", true }
 };
-static const VersionRangeDefinition kWindowsMediaPlayerVersionRange[] = {
-    { "", "", "", true }
-};
-static const VersionRangeDefinition kNvidia3DVersionRange[] = {
-    { "", "", "", true }
-};
 static const PluginGroupDefinition kGroupDefinitions[] = {
   kFlashDefinition,
   { "apple-quicktime", PluginGroup::kQuickTimeGroupName, "QuickTime Plug-in",
@@ -169,18 +185,23 @@ static const PluginGroupDefinition kGroupDefinitions[] = {
     "http://www.real.com/realplayer/download" },
   // These are here for grouping, no vulnerabilities known.
   { "windows-media-player", PluginGroup::kWindowsMediaPlayerGroupName,
-    "Windows Media Player", kWindowsMediaPlayerVersionRange,
-    arraysize(kWindowsMediaPlayerVersionRange), "" },
+    "Windows Media Player", kAllVersionsInfobarVersionRange,
+    arraysize(kAllVersionsInfobarVersionRange), "" },
   { "microsoft-office", "Microsoft Office", "Microsoft Office",
     NULL, 0, "" },
-  { "nvidia-3d", "NVIDIA 3D", "NVIDIA 3D", kNvidia3DVersionRange,
-    arraysize(kNvidia3DVersionRange), "" },
+  { "nvidia-3d", "NVIDIA 3D", "NVIDIA 3D", kAllVersionsInfobarVersionRange,
+    arraysize(kAllVersionsInfobarVersionRange), "" },
+  kChromePdfDefinition,
+  kGoogleTalkDefinition,
 };
 
 #elif defined(OS_CHROMEOS)
 // ChromeOS generally has (autoupdated) system plug-ins and no user-installable
-// plug-ins.
-static const PluginGroupDefinition kGroupDefinitions[] = { };
+// plug-ins, so we just use these definitions for grouping.
+static const PluginGroupDefinition kGroupDefinitions[] = {
+  kFlashDefinition,
+  kChromePdfDefinition,
+};
 
 #else  // Most importantly, covers desktop Linux.
 static const VersionRangeDefinition kJavaVersionRange[] = {
@@ -204,6 +225,8 @@ static const PluginGroupDefinition kGroupDefinitions[] = {
   { "redhat-icetea-java", "IcedTea", "IcedTea",
     kRedhatIcedTeaVersionRange, arraysize(kRedhatIcedTeaVersionRange),
     "http://www.linuxsecurity.com/content/section/3/170/" },
+  kChromePdfDefinition,
+  kGoogleTalkDefinition,
 };
 #endif