Clean up PluginGroup and related code.

chrome/browser/plugin_exceptions_table_model.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_exceptions_table_model.h"
 
 #include "app/l10n_util.h"
 #include "app/table_model_observer.h"
 #include "base/auto_reset.h"
 #include "base/sys_string_conversions.h"
@@ skipping 111 matching lines @@
     ReloadSettings();
 }
 
 void PluginExceptionsTableModel::ClearSettings() {
   settings_.clear();
   groups_.clear();
   row_counts_.clear();
   resources_.clear();
 }
 
-void PluginExceptionsTableModel::GetPlugins(
-    NPAPI::PluginList::PluginMap* plugins) {
-  NPAPI::PluginList::Singleton()->GetPluginGroups(false, plugins);
+std::vector<PluginGroup> PluginExceptionsTableModel::GetPlugins() {
+  return NPAPI::PluginList::Singleton()->GetPluginGroups(false);
 }
 
 void PluginExceptionsTableModel::LoadSettings() {
   int group_id = 0;
-  NPAPI::PluginList::PluginMap plugins;
-  GetPlugins(&plugins);
-  for (NPAPI::PluginList::PluginMap::iterator it = plugins.begin();
-       it != plugins.end(); ++it) {
-    std::string plugin = it->first;
+  std::vector<PluginGroup> plugins(GetPlugins());

[Bernhard Bauer, 2010/12/03 16:13:28]

Are we sure that the compiler optimizes any unnecessary copying away (on all
platforms)?

[Jakob Kummerow, 2010/12/06 18:21:12]

Done. (Changed the interface.)

+  for (size_t i = 0; i < plugins.size(); ++i) {
+    std::string plugin = plugins[i].identifier();
     HostContentSettingsMap::SettingsForOneType settings;
     map_->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS,
                                 plugin,
                                 &settings);
     HostContentSettingsMap::SettingsForOneType otr_settings;
     if (otr_map_) {
       otr_map_->GetSettingsForOneType(CONTENT_SETTINGS_TYPE_PLUGINS,
                                       plugin,
                                       &otr_settings);
     }
-    std::wstring title = UTF16ToWide(it->second->GetGroupName());
+    std::wstring title = UTF16ToWide(plugins[i].GetGroupName());
     for (HostContentSettingsMap::SettingsForOneType::iterator setting_it =
              settings.begin(); setting_it != settings.end(); ++setting_it) {
       SettingsEntry entry = {
         setting_it->first,
         group_id,
         setting_it->second,
         false
       };
       settings_.push_back(entry);
     }
@@ skipping 19 matching lines @@
 }
 
 void PluginExceptionsTableModel::ReloadSettings() {
   ClearSettings();
   LoadSettings();
 
   if (observer_)
     observer_->OnModelChanged();
 }