Revert 138502 - Move version metadata from PluginGroup into PluginInstaller.

chrome/browser/plugin_finder_unittest.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 "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"
 
 using base::DictionaryValue;
 using webkit::npapi::PluginGroup;
 using webkit::npapi::PluginList;
 
 TEST(PluginFinderTest, JsonSyntax) {
   scoped_ptr<DictionaryValue> plugin_list(PluginFinder::LoadPluginList());
   ASSERT_TRUE(plugin_list.get());
@@ skipping 11 matching lines @@
     if (plugin->HasKey("displayurl"))
       EXPECT_TRUE(plugin->GetBoolean("displayurl", &dummy_bool));
     if (plugin->HasKey("requires_authorization"))
       EXPECT_TRUE(plugin->GetBoolean("requires_authorization", &dummy_bool));
     ListValue* mime_types = NULL;
     ASSERT_TRUE(plugin->GetList("mime_types", &mime_types));
     for (ListValue::const_iterator mime_type_it = mime_types->begin();
          mime_type_it != mime_types->end(); ++mime_type_it) {
       EXPECT_TRUE((*mime_type_it)->GetAsString(&dummy_str));
     }
-    ListValue* versions = NULL;
-    if (!plugin->GetList("versions", &versions))
-      continue;
-
-    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 << "\"";
-    }
   }
 }
+
+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())
+      continue;
+    std::string identifier = (*it)->identifier();
+    EXPECT_TRUE(plugin_finder.FindPluginWithIdentifier(identifier)) <<
+        "Couldn't find PluginInstaller for '" << identifier << "'";
+  }
+}