Clean up PluginGroup and related code.

chrome/browser/plugin_updater.cc

 // Copyright (c) 2010 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_updater.h"
 
+#include <set>
 #include <string>
-#include <vector>
 
 #include "base/command_line.h"
 #include "base/message_loop.h"
 #include "base/path_service.h"
 #include "base/scoped_ptr.h"
 #include "base/utf_string_conversions.h"
 #include "base/values.h"
 #include "base/version.h"
 #include "chrome/browser/browser_thread.h"
 #include "chrome/browser/prefs/pref_service.h"
@@ skipping 19 matching lines @@
   DictionaryValue* data = new DictionaryValue();
   data->SetString("path", plugin.path.value());
   data->SetString("name", plugin.name);
   data->SetString("version", plugin.version);
   data->SetBoolean("enabled", plugin.enabled);
   return data;
 }
 
 // static
 ListValue* PluginUpdater::GetPluginGroupsData() {
-  NPAPI::PluginList::PluginMap plugin_groups;
-  NPAPI::PluginList::Singleton()->GetPluginGroups(true, &plugin_groups);
+  std::vector<PluginGroup> plugin_groups(
+      NPAPI::PluginList::Singleton()->GetPluginGroups(true));
 
   // Construct DictionaryValues to return to the UI
   ListValue* plugin_groups_data = new ListValue();
-  for (NPAPI::PluginList::PluginMap::const_iterator it =
-       plugin_groups.begin();
-       it != plugin_groups.end();
-       ++it) {
-    plugin_groups_data->Append(it->second->GetDataForUI());
+  for (size_t i = 0; i < plugin_groups.size(); ++i) {
+    plugin_groups_data->Append(plugin_groups[i].GetDataForUI());
   }
   return plugin_groups_data;
 }
 
 void PluginUpdater::EnablePluginGroup(bool enable, const string16& group_name) {
   if (PluginGroup::IsPluginNameDisabledByPolicy(group_name))
     enable = false;
   NPAPI::PluginList::Singleton()->EnableGroup(enable, group_name);
   NotifyPluginStatusChanged();
 }
@@ skipping 169 matching lines @@
     BrowserThread::FILE,
     FROM_HERE,
     NewRunnableFunction(
         &PluginUpdater::GetPreferencesDataOnFileThread, profile), delay_ms);
 }
 
 void PluginUpdater::GetPreferencesDataOnFileThread(void* profile) {
   std::vector<WebPluginInfo> plugins;
   NPAPI::PluginList::Singleton()->GetPlugins(false, &plugins);
 
-  NPAPI::PluginList::PluginMap groups;
-  NPAPI::PluginList::Singleton()->GetPluginGroups(false, &groups);
+  std::vector<PluginGroup> groups(
+      NPAPI::PluginList::Singleton()->GetPluginGroups(false));
 
   BrowserThread::PostTask(
     BrowserThread::UI,
     FROM_HERE,
     NewRunnableFunction(
         &PluginUpdater::OnUpdatePreferences,
         static_cast<Profile*>(profile), plugins, groups));
 }
 
 void PluginUpdater::OnUpdatePreferences(
     Profile* profile,
     const std::vector<WebPluginInfo>& plugins,
-    const NPAPI::PluginList::PluginMap& groups) {
+    const std::vector<PluginGroup>& groups) {
   ListValue* plugins_list = profile->GetPrefs()->GetMutableList(
       prefs::kPluginsPluginsList);
   plugins_list->Clear();
 
   FilePath internal_dir;
   if (PathService::Get(chrome::DIR_INTERNAL_PLUGINS, &internal_dir))
     profile->GetPrefs()->SetFilePath(prefs::kPluginsLastInternalDirectory,
                                      internal_dir);
 
   // Add the plugin files.
   for (std::vector<WebPluginInfo>::const_iterator it = plugins.begin();
        it != plugins.end();
        ++it) {
     plugins_list->Append(CreatePluginFileSummary(*it));
   }
 
   // Add the groups as well.
-  for (NPAPI::PluginList::PluginMap::const_iterator it = groups.begin();
-       it != groups.end(); ++it) {
+  for (size_t i = 0; i < groups.size(); ++i) {
     // Don't save preferences for vulnerable pugins.
     if (!CommandLine::ForCurrentProcess()->HasSwitch(
           switches::kDisableOutdatedPlugins) ||
-        !it->second->IsVulnerable()) {
-      plugins_list->Append(it->second->GetSummary());
+        !groups[i].IsVulnerable()) {
+      plugins_list->Append(groups[i].GetSummary());
     }
   }
 }
 
 void PluginUpdater::NotifyPluginStatusChanged() {
   if (notify_pending_)
     return;
   notify_pending_ = true;
   MessageLoop::current()->PostTask(
       FROM_HERE,
       NewRunnableFunction(&PluginUpdater::OnNotifyPluginStatusChanged));
 }
 
 void PluginUpdater::OnNotifyPluginStatusChanged() {
   GetPluginUpdater()->notify_pending_ = false;
   NotificationService::current()->Notify(
       NotificationType::PLUGIN_ENABLE_STATUS_CHANGED,
       Source<PluginUpdater>(GetPluginUpdater()),
       NotificationService::NoDetails());
 }
 
 /*static*/
 PluginUpdater* PluginUpdater::GetPluginUpdater() {
   return Singleton<PluginUpdater>::get();
 }