Separate plugin_metadata from plugin_installer, thread-safe plugin_finder

chrome/browser/plugins/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/plugins/plugin_finder.h"
 
 #include "base/values.h"
-#include "chrome/browser/plugins/plugin_installer.h"
+#include "chrome/browser/plugins/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) {
   scoped_ptr<DictionaryValue> plugin_list(PluginFinder::LoadPluginList());
   ASSERT_TRUE(plugin_list.get());
   for (DictionaryValue::Iterator plugin_it(*plugin_list);
        plugin_it.HasNext(); plugin_it.Advance()) {
     const DictionaryValue* plugin = NULL;
     ASSERT_TRUE(plugin_it.value().GetAsDictionary(&plugin));
     std::string dummy_str;
@@ skipping 19 matching lines @@
     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))
+      PluginMetadata::SecurityStatus status =
+          PluginMetadata::SECURITY_STATUS_UP_TO_DATE;
+      EXPECT_TRUE(PluginMetadata::ParseSecurityStatus(status_str, &status))
           << "Invalid security status \"" << status_str << "\"";
     }
   }
 }