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

chrome/browser/mock_plugin_exceptions_table_model.cc

Index: chrome/browser/mock_plugin_exceptions_table_model.cc
diff --git a/chrome/browser/mock_plugin_exceptions_table_model.cc b/chrome/browser/mock_plugin_exceptions_table_model.cc
index 77b2a2f2a8021e07cb6c19c349788b7a3540a526..1c88524e3dbd58384dcb1c95a18b1d88fab6ee43 100644
--- a/chrome/browser/mock_plugin_exceptions_table_model.cc
+++ b/chrome/browser/mock_plugin_exceptions_table_model.cc
@@ -5,11 +5,11 @@
 #include "chrome/browser/mock_plugin_exceptions_table_model.h"
 
 void MockPluginExceptionsTableModel::set_plugins(
-    std::vector<PluginGroup>& plugins) {
+    std::vector<webkit::npapi::PluginGroup>& plugins) {
   plugins_ = plugins;
 }
 
 void MockPluginExceptionsTableModel::GetPlugins(
-    std::vector<PluginGroup>* plugin_groups) {
+    std::vector<webkit::npapi::PluginGroup>* plugin_groups) {
   *plugin_groups = plugins_;
 }