Revert "Revert 69755 - Move the NPAPI files from webkit/glue/plugins to webkit/plugins/npapi"

chrome/browser/plugin_exceptions_table_model.cc

Index: chrome/browser/plugin_exceptions_table_model.cc
diff --git a/chrome/browser/plugin_exceptions_table_model.cc b/chrome/browser/plugin_exceptions_table_model.cc
index 7ad5b1329e0fdd56d91c81eea2c444c755a242e4..5b2a2c183409381e09946a2053a2a9bc5d53eb5f 100644
--- a/chrome/browser/plugin_exceptions_table_model.cc
+++ b/chrome/browser/plugin_exceptions_table_model.cc
@@ -134,13 +134,13 @@ void PluginExceptionsTableModel::ClearSettings() {
 }
 
 void PluginExceptionsTableModel::GetPlugins(
-    std::vector<PluginGroup>* plugin_groups) {
-  NPAPI::PluginList::Singleton()->GetPluginGroups(false, plugin_groups);
+    std::vector<webkit::npapi::PluginGroup>* plugin_groups) {
+  webkit::npapi::PluginList::Singleton()->GetPluginGroups(false, plugin_groups);
 }
 
 void PluginExceptionsTableModel::LoadSettings() {
   int group_id = 0;
-  std::vector<PluginGroup> plugins;
+  std::vector<webkit::npapi::PluginGroup> plugins;
   GetPlugins(&plugins);
   for (size_t i = 0; i < plugins.size(); ++i) {
     std::string plugin = plugins[i].identifier();