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

chrome/browser/mock_plugin_exceptions_table_model.h

Index: chrome/browser/mock_plugin_exceptions_table_model.h
diff --git a/chrome/browser/mock_plugin_exceptions_table_model.h b/chrome/browser/mock_plugin_exceptions_table_model.h
index 15a1c5b8ec5336c04889ac67b9a78d790732839f..c63d67f6eccc115334038548f72660397d2b1f7e 100644
--- a/chrome/browser/mock_plugin_exceptions_table_model.h
+++ b/chrome/browser/mock_plugin_exceptions_table_model.h
@@ -17,13 +17,14 @@ class MockPluginExceptionsTableModel : public PluginExceptionsTableModel {
       : PluginExceptionsTableModel(map, otr_map) {}
   virtual ~MockPluginExceptionsTableModel() {}
 
-  void set_plugins(std::vector<PluginGroup>& plugins);
+  void set_plugins(std::vector<webkit::npapi::PluginGroup>& plugins);
 
  protected:
-  virtual void GetPlugins(std::vector<PluginGroup>* plugin_groups);
+  virtual void GetPlugins(
+      std::vector<webkit::npapi::PluginGroup>* plugin_groups);
 
  private:
-  std::vector<PluginGroup> plugins_;
+  std::vector<webkit::npapi::PluginGroup> plugins_;
 };
 
 #endif  // CHROME_BROWSER_MOCK_PLUGIN_EXCEPTIONS_TABLE_MODEL_H_