Reland 138502 - Move version metadata from PluginGroup into PluginInstaller.

This also moves the plug-in information JSON files into their own subdirectory, so they can be changed without requiring OWNERS reviews for chrome/browser/resources (which is mostly WebUI otherwise).

BUG=124396
TEST=PluginInstallerTest.SecurityStatus:PluginFinderTest.JsonSyntax
TBR=jam@chromium.org,jhawkins@chromium.org
Original review URL: https://chromiumcodereview.appspot.com/10263022


Review URL: https://chromiumcodereview.appspot.com/10411098

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

1 files changed, 16 insertions, 14 deletions

diff --git a/chrome/browser/plugin_finder_unittest.cc b/chrome/browser/plugin_finder_unittest.cc
index fede022..d6afe1f 100644
--- a/chrome/browser/plugin_finder_unittest.cc
+++ b/chrome/browser/plugin_finder_unittest.cc
@@ -5,6 +5,7 @@
 #include "chrome/browser/plugin_finder.h"
 
 #include "base/values.h"
+#include "chrome/browser/plugin_installer.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "webkit/plugins/npapi/plugin_list.h"
 
@@ -36,20 +37,21 @@ TEST(PluginFinderTest, JsonSyntax) {
          mime_type_it != mime_types->end(); ++mime_type_it) {
       EXPECT_TRUE((*mime_type_it)->GetAsString(&dummy_str));
     }
-  }
-}
-
-TEST(PluginFinderTest, PluginGroups) {
-  PluginFinder plugin_finder;
-  PluginList* plugin_list = PluginList::Singleton();
-  const std::vector<PluginGroup*>& plugin_groups =
-      plugin_list->GetHardcodedPluginGroups();
-  for (std::vector<PluginGroup*>::const_iterator it = plugin_groups.begin();
-       it != plugin_groups.end(); ++it) {
-    if ((*it)->version_ranges().empty())
+    ListValue* versions = NULL;
+    if (!plugin->GetList("versions", &versions))
       continue;
-    std::string identifier = (*it)->identifier();
-    EXPECT_TRUE(plugin_finder.FindPluginWithIdentifier(identifier)) <<
-        "Couldn't find PluginInstaller for '" << identifier << "'";
+
+    for (ListValue::const_iterator it = versions->begin();
+         it != versions->end(); ++it) {
+      DictionaryValue* version_dict = NULL;
+      ASSERT_TRUE((*it)->GetAsDictionary(&version_dict));
+      EXPECT_TRUE(version_dict->GetString("version", &dummy_str));
+      std::string status_str;
+      EXPECT_TRUE(version_dict->GetString("status", &status_str));
+      PluginInstaller::SecurityStatus status =
+          PluginInstaller::SECURITY_STATUS_UP_TO_DATE;
+      EXPECT_TRUE(PluginInstaller::ParseSecurityStatus(status_str, &status))
+          << "Invalid security status \"" << status_str << "\"";
+    }
   }
 }