Clean up PluginGroup and related code.

chrome/browser/plugin_exceptions_table_model.h

Index: chrome/browser/plugin_exceptions_table_model.h
diff --git a/chrome/browser/plugin_exceptions_table_model.h b/chrome/browser/plugin_exceptions_table_model.h
index 37009a249493284f46d9e8e255478fc1924539e9..12b114e93c3e2a62ad15449e1b44f60f44c43798 100644
--- a/chrome/browser/plugin_exceptions_table_model.h
+++ b/chrome/browser/plugin_exceptions_table_model.h
@@ -7,6 +7,8 @@
 #pragma once
 
 #include <deque>
+#include <string>
+#include <vector>
 
 #include "chrome/browser/content_settings/host_content_settings_map.h"
 #include "chrome/browser/remove_rows_table_model.h"
@@ -49,16 +51,16 @@ class PluginExceptionsTableModel : public RemoveRowsTableModel,
 
  protected:
   // Subclasses can override this method for testing.
-  virtual void GetPlugins(NPAPI::PluginList::PluginMap* plugins);
+  virtual std::vector<PluginGroup> GetPlugins();
 
  private:
   friend class plugin_test_internal::PluginExceptionsTableModelTest;
 
   struct SettingsEntry {
-   HostContentSettingsMap::Pattern pattern;
-   int plugin_id;
-   ContentSetting setting;
-   bool is_otr;
+    HostContentSettingsMap::Pattern pattern;
+    int plugin_id;
+    ContentSetting setting;
+    bool is_otr;
   };
 
   void ClearSettings();