Clean up PluginGroup and related code.

chrome/browser/ui/cocoa/table_model_array_controller_unittest.mm

Index: chrome/browser/ui/cocoa/table_model_array_controller_unittest.mm
diff --git a/chrome/browser/ui/cocoa/table_model_array_controller_unittest.mm b/chrome/browser/ui/cocoa/table_model_array_controller_unittest.mm
index 65b901fb6fbfbc83701e446db684771b177cbfd4..051d58beda36a5e241fc3ecb6341950f448313a0 100644
--- a/chrome/browser/ui/cocoa/table_model_array_controller_unittest.mm
+++ b/chrome/browser/ui/cocoa/table_model_array_controller_unittest.mm
@@ -18,8 +18,6 @@
 #include "webkit/glue/plugins/plugin_list.h"
 #include "webkit/glue/plugins/webplugininfo.h"
 
-namespace {
-
 class TableModelArrayControllerTest : public CocoaTest {
  public:
   TableModelArrayControllerTest()
@@ -52,25 +50,28 @@ class TableModelArrayControllerTest : public CocoaTest {
 
     model_.reset(new MockPluginExceptionsTableModel(map, NULL));
 
-    NPAPI::PluginList::PluginMap plugins;
+    std::vector<PluginGroup> plugins;
     WebPluginInfo foo_plugin;
     foo_plugin.path = FilePath(FILE_PATH_LITERAL("a-foo"));
     foo_plugin.name = ASCIIToUTF16("FooPlugin");
     foo_plugin.enabled = true;
-    PluginGroup* foo_group = PluginGroup::FromWebPluginInfo(foo_plugin);
-    plugins[foo_group->identifier()] = linked_ptr<PluginGroup>(foo_group);
+    scoped_ptr<PluginGroup> foo_group(
+        PluginGroup::FromWebPluginInfo(foo_plugin));
+    plugins.push_back(*foo_group);
     WebPluginInfo bar_plugin;
     bar_plugin.path = FilePath(FILE_PATH_LITERAL("b-bar"));
     bar_plugin.name = ASCIIToUTF16("BarPlugin");
     bar_plugin.enabled = true;
-    PluginGroup* bar_group = PluginGroup::FromWebPluginInfo(bar_plugin);
-    plugins[bar_group->identifier()] = linked_ptr<PluginGroup>(bar_group);
+    scoped_ptr<PluginGroup> bar_group(
+        PluginGroup::FromWebPluginInfo(bar_plugin));
+    plugins.push_back(*bar_group);
     WebPluginInfo blurp_plugin;
     blurp_plugin.path = FilePath(FILE_PATH_LITERAL("c-blurp"));
     blurp_plugin.name = ASCIIToUTF16("BlurpPlugin");
     blurp_plugin.enabled = true;
-    PluginGroup* blurp_group = PluginGroup::FromWebPluginInfo(blurp_plugin);
-    plugins[blurp_group->identifier()] = linked_ptr<PluginGroup>(blurp_group);
+    scoped_ptr<PluginGroup> blurp_group(
+        PluginGroup::FromWebPluginInfo(blurp_plugin));
+    plugins.push_back(*blurp_group);
 
     model_->set_plugins(plugins);
     model_->LoadSettings();
@@ -168,5 +169,3 @@ TEST_F(TableModelArrayControllerTest, AddException) {
               @")",
               [titles description]);
 }
-
-}  // namespace