Separate plugin_metadata from plugin_installer, thread-safe plugin_finder

chrome/browser/plugin_finder_unittest.cc

Index: chrome/browser/plugin_finder_unittest.cc
diff --git a/chrome/browser/plugin_finder_unittest.cc b/chrome/browser/plugin_finder_unittest.cc
index 8d3d46b8b1e09aeba75750d8db3c979102bf78fb..3d455330b8ffacdc9726f990a4419bb2a2463c02 100644
--- a/chrome/browser/plugin_finder_unittest.cc
+++ b/chrome/browser/plugin_finder_unittest.cc
@@ -5,12 +5,11 @@
 #include "chrome/browser/plugin_finder.h"
 
 #include "base/values.h"
-#include "chrome/browser/plugin_installer.h"
+#include "chrome/browser/plugin_metadata.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) {
@@ -50,9 +49,9 @@ TEST(PluginFinderTest, JsonSyntax) {
       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))
+      PluginMetadata::SecurityStatus status =
+          PluginMetadata::SECURITY_STATUS_UP_TO_DATE;
+      EXPECT_TRUE(PluginMetadata::ParseSecurityStatus(status_str, &status))
           << "Invalid security status \"" << status_str << "\"";
     }
   }