Block NPAPI plugins by default Add Facebook video calling and Google Earth plugins to the tracked list.

BUG=281651

Review URL: https://codereview.chromium.org/23440066

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@225316 0039d316-1c4b-4281-b951-d872f2087c98

4 files changed, 67 insertions, 11 deletions

diff --git a/chrome/browser/plugins/plugin_metadata.cc b/chrome/browser/plugins/plugin_metadata.cc
index 5f2fc50..75ca52a 100644
--- a/chrome/browser/plugins/plugin_metadata.cc
+++ b/chrome/browser/plugins/plugin_metadata.cc
@@ -93,12 +93,8 @@ bool PluginMetadata::ParseSecurityStatus(
 PluginMetadata::SecurityStatus PluginMetadata::GetSecurityStatus(
     const content::WebPluginInfo& plugin) const {
   if (versions_.empty()) {
-#if defined(OS_LINUX)
-    // On Linux, unknown plugins require authorization.
+    // Unknown plugins require authorization.
     return SECURITY_STATUS_REQUIRES_AUTHORIZATION;
-#else
-    return SECURITY_STATUS_UP_TO_DATE;
-#endif
   }
 
   Version version;
diff --git a/chrome/browser/plugins/plugin_metadata_unittest.cc b/chrome/browser/plugins/plugin_metadata_unittest.cc
index bb69ee7..b84843a 100644
--- a/chrome/browser/plugins/plugin_metadata_unittest.cc
+++ b/chrome/browser/plugins/plugin_metadata_unittest.cc
@@ -38,12 +38,8 @@ TEST(PluginMetadataTest, SecurityStatus) {
                                  GURL(),
                                  ASCIIToUTF16("ClayBrick"),
                                  std::string());
-#if defined(OS_LINUX)
   EXPECT_EQ(kRequiresAuthorization,
             GetSecurityStatus(&plugin_metadata, "1.2.3"));
-#else
-  EXPECT_EQ(kUpToDate, GetSecurityStatus(&plugin_metadata, "1.2.3"));
-#endif
 
   plugin_metadata.AddVersion(Version("9.4.1"), kRequiresAuthorization);
   plugin_metadata.AddVersion(Version("10"), kOutOfDate);
diff --git a/chrome/browser/resources/plugin_metadata/plugins_mac.json b/chrome/browser/resources/plugin_metadata/plugins_mac.json
index 85de8e1..ed4eab0 100644
--- a/chrome/browser/resources/plugin_metadata/plugins_mac.json
+++ b/chrome/browser/resources/plugin_metadata/plugins_mac.json
@@ -1,5 +1,5 @@
 {
-  "x-version": 3,
+  "x-version": 4,
   "google-talk": {
     "mime_types": [
     ],
@@ -273,5 +273,37 @@
     ],
     "name": "Chrome PDF Viewer",
     "group_name_matcher": "*Chrome PDF Viewer*"
+  },
+  "facebook-video-calling": {
+    "mime_types": [
+      "application/skypesdk-plugin"
+    ],
+    "versions": [
+      {
+        "version": "0",
+        "status": "up_to_date",
+        "comment": "We do not track version information for the Facebook Video Calling Plugin."
+      }
+    ],
+    "lang": "en-US",
+    "name": "Facebook Video Calling",
+    "url": "https://www.facebook.com/chat/video/videocalldownload.php",
+    "group_name_matcher": "*Facebook Video*"
+  },
+  "google-earth": {
+    "mime_types": [
+      "application/geplugin"
+    ],
+    "versions": [
+      {
+        "version": "0",
+        "status": "up_to_date",
+        "comment": "We do not track version information for the Google Earth Plugin."
+      }
+    ],
+    "lang": "en-US",
+    "name": "Google Earth",
+    "url": "http://www.google.com/earth/explore/products/plugin.html",
+    "group_name_matcher": "*Google Earth*"
   }
 }
diff --git a/chrome/browser/resources/plugin_metadata/plugins_win.json b/chrome/browser/resources/plugin_metadata/plugins_win.json
index 0cc937d..5bdbc8d 100644
--- a/chrome/browser/resources/plugin_metadata/plugins_win.json
+++ b/chrome/browser/resources/plugin_metadata/plugins_win.json
@@ -1,5 +1,5 @@
 {
-  "x-version": 9,
+  "x-version": 10,
   "google-talk": {
     "mime_types": [
     ],
@@ -384,5 +384,37 @@
     ],
     "name": "Google Update",
     "group_name_matcher": "Google Update"
+  },
+  "facebook-video-calling": {
+    "mime_types": [
+      "application/skypesdk-plugin"
+    ],
+    "versions": [
+      {
+        "version": "0",
+        "status": "up_to_date",
+        "comment": "We do not track version information for the Facebook Video Calling Plugin."
+      }
+    ],
+    "lang": "en-US",
+    "name": "Facebook Video Calling",
+    "url": "https://www.facebook.com/chat/video/videocalldownload.php",
+    "group_name_matcher": "*Facebook Video*"
+  },
+  "google-earth": {
+    "mime_types": [
+      "application/geplugin"
+    ],
+    "versions": [
+      {
+        "version": "0",
+        "status": "up_to_date",
+        "comment": "We do not track version information for the Google Earth Plugin."
+      }
+    ],
+    "lang": "en-US",
+    "name": "Google Earth",
+    "url": "http://www.google.com/earth/explore/products/plugin.html",
+    "group_name_matcher": "*Google Earth*"
   }
 }