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

webkit/plugins/npapi/plugin_list.cc

 // Copyright (c) 2012 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 37 matching lines @@
   return allow;
 }
 
 }
 
 namespace webkit {
 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[] = {
     { "", "", "10.3.183", false }
 };
 // This is up to date with
 // http://www.adobe.com/support/security/bulletins/apsb11-19.html
 static const VersionRangeDefinition kShockwaveVersionRange[] = {
     { "",  "", "11.6.1.629", true }
 };
@@ skipping 11 matching lines @@
 #define kShockwaveDefinition { \
     "shockwave", PluginGroup::kShockwaveGroupName, "Shockwave for Director", \
     kShockwaveVersionRange, arraysize(kShockwaveVersionRange), \
     "http://www.adobe.com/shockwave/download/" }
 
 #define kSilverlightDefinition { \
     "silverlight", PluginGroup::kSilverlightGroupName, "Silverlight", \
     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
 // (new versions) are published.
 static const VersionRangeDefinition kQuicktimeVersionRange[] = {
     { "", "", "7.6.6", true }
 };
 static const VersionRangeDefinition kJavaVersionRange[] = {
     { "0", "13.0", "12.8.0", true },  // Leopard
     { "13.0", "14.0", "13.5.0", true },  // Snow Leopard
     { "14.0", "", "14.0.3", true }  // Lion
 };
 static const VersionRangeDefinition kFlip4MacVersionRange[] = {
     { "", "", "2.2.1", true }
 };
 // Note: The Adobe Reader browser plug-in is not supported in Chrome.
 // Note: The Real Player plugin for mac doesn't expose a version at all.
 static const PluginGroupDefinition kGroupDefinitions[] = {
   kFlashDefinition,
   { "apple-quicktime", PluginGroup::kQuickTimeGroupName, "QuickTime Plug-in",
     kQuicktimeVersionRange, arraysize(kQuicktimeVersionRange),
     "http://www.apple.com/quicktime/download/" },
   { "java-runtime-environment", PluginGroup::kJavaGroupName, "Java",
     kJavaVersionRange, arraysize(kJavaVersionRange),
     "http://support.apple.com/kb/HT1338" },
   kSilverlightDefinition,
   { "flip4mac", "Flip4Mac", "Flip4Mac", kFlip4MacVersionRange,
     arraysize(kFlip4MacVersionRange),
     "http://www.telestream.net/flip4mac-wmv/overview.htm" },
-  kShockwaveDefinition
+  kShockwaveDefinition,
+  kChromePdfDefinition,
+  kGoogleTalkDefinition,
 };
 
 #elif defined(OS_WIN)
 // TODO(panayiotis): We should group "RealJukebox NS Plugin" with the rest of
 // the RealPlayer files.
 static const VersionRangeDefinition kQuicktimeVersionRange[] = {
     { "", "", "7.6.9", true }
 };
 static const VersionRangeDefinition kJavaVersionRange[] = {
     { "0", "7", "6.0.310", true },  // "310" is not a typo.
     { "7", "", "10.3", true }  // JDK7u3 identifies itself as 10.3
 };
 // This is up to date with
 // http://www.adobe.com/support/security/bulletins/apsb11-24.html
 static const VersionRangeDefinition kAdobeReaderVersionRange[] = {
     { "10", "11", "10.1.1", false },
     { "9", "10", "9.4.6", false },
     { "0", "9", "8.3.1", false }
 };
 static const VersionRangeDefinition kDivXVersionRange[] = {
     { "", "", "1.4.3.4", false }
 };
 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",
     kQuicktimeVersionRange, arraysize(kQuicktimeVersionRange),
     "http://www.apple.com/quicktime/download/" },
   { "java-runtime-environment", PluginGroup::kJavaGroupName, "Java",
     kJavaVersionRange, arraysize(kJavaVersionRange),
     "http://www.java.com/download" },
   { "adobe-reader", PluginGroup::kAdobeReaderGroupName, "Adobe Acrobat",
     kAdobeReaderVersionRange, arraysize(kAdobeReaderVersionRange),
     "http://get.adobe.com/reader/" },
   kSilverlightDefinition,
   kShockwaveDefinition,
   { "divx-player", "DivX Player", "DivX Web Player", kDivXVersionRange,
     arraysize(kDivXVersionRange),
     "http://download.divx.com/divx/autoupdate/player/"
     "DivXWebPlayerInstaller.exe" },
   { "realplayer", PluginGroup::kRealPlayerGroupName, "RealPlayer",
     kRealPlayerVersionRange, arraysize(kRealPlayerVersionRange),
     "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[] = {
     { "0", "1.7", "1.6.0.29", true },
     { "1.7", "", "1.7.0.1", true }
 };
 
 static const VersionRangeDefinition kRedhatIcedTeaVersionRange[] = {
     { "0", "1.9", "1.8.10", true },
     { "1.9", "1.10", "1.9.10", true },
     { "1.10", "", "1.10.4", true }
 };
 
 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", PluginGroup::kJavaGroupName, "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/" },
+  kChromePdfDefinition,
+  kGoogleTalkDefinition,
 };
 #endif
 
 // static
 PluginList* PluginList::Singleton() {
   return g_singleton.Pointer();
 }
 
 // static
 bool PluginList::DebugPluginLoading() {
@@ skipping 484 matching lines @@
   }
   return false;
 }
 
 PluginList::~PluginList() {
 }
 
 
 }  // namespace npapi
 }  // namespace webkit