From c85b0ba71b5a55647b01de9d345e46896979033d Mon Sep 17 00:00:00 2001
From: "chase@chromium.org"
 <chase@chromium.org@0039d316-1c4b-4281-b951-d872f2087c98>
Date: Tue, 21 Dec 2010 00:23:26 +0000
Subject: Revert "Move the NPAPI files from webkit/glue/plugins to
 webkit/plugins/npapi"

Manually reverting r69755, which broke the tree.

BUG=none
TEST=none
TBR=dmaclach@chromium.org

Review URL: http://codereview.chromium.org/5998002

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@69771 0039d316-1c4b-4281-b951-d872f2087c98
---
 chrome/browser/mock_plugin_exceptions_table_model.h | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

(limited to '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 c63d67f..15a1c5b 100644
--- a/chrome/browser/mock_plugin_exceptions_table_model.h
+++ b/chrome/browser/mock_plugin_exceptions_table_model.h
@@ -17,14 +17,13 @@ class MockPluginExceptionsTableModel : public PluginExceptionsTableModel {
       : PluginExceptionsTableModel(map, otr_map) {}
   virtual ~MockPluginExceptionsTableModel() {}
 
-  void set_plugins(std::vector<webkit::npapi::PluginGroup>& plugins);
+  void set_plugins(std::vector<PluginGroup>& plugins);
 
  protected:
-  virtual void GetPlugins(
-      std::vector<webkit::npapi::PluginGroup>* plugin_groups);
+  virtual void GetPlugins(std::vector<PluginGroup>* plugin_groups);
 
  private:
-  std::vector<webkit::npapi::PluginGroup> plugins_;
+  std::vector<PluginGroup> plugins_;
 };
 
 #endif  // CHROME_BROWSER_MOCK_PLUGIN_EXCEPTIONS_TABLE_MODEL_H_
-- 
cgit v1.1