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

webkit/glue/plugins/plugin_lib.h

 // Copyright (c) 2010 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_NPAPI_PLUGIN_LIB_H_
-#define WEBKIT_PLUGINS_NPAPI_PLUGIN_LIB_H_
+#ifndef WEBKIT_GLUE_PLUGINS_PLUGIN_LIB_H_
+#define WEBKIT_GLUE_PLUGINS_PLUGIN_LIB_H_
 
 #include <string>
 #include <vector>
 
 #include "base/basictypes.h"
 #include "base/native_library.h"
 #include "base/ref_counted.h"
 #include "build/build_config.h"
-#include "webkit/plugins/npapi/plugin_list.h"
-#include "webkit/plugins/npapi/webplugin.h"
+#include "webkit/glue/plugins/plugin_list.h"
+#include "webkit/glue/plugins/webplugin.h"
 
 class FilePath;
 struct WebPluginInfo;
 
-namespace webkit {
-namespace npapi {
+namespace NPAPI {
 
 class PluginInstance;
 
 // A PluginLib is a single NPAPI Plugin Library, and is the lifecycle
 // manager for new PluginInstances.
 class PluginLib : public base::RefCounted<PluginLib> {
  public:
   static PluginLib* CreatePluginLib(const FilePath& filename);
 
   // Creates a WebPluginInfo structure given a plugin's path.  On success
@@ skipping 76 matching lines @@
   NPSavedData *saved_data_;  // Persisted plugin info for NPAPI.
   int instance_count_;  // Count of plugins in use.
   bool skip_unload_;  // True if library_ should not be unloaded.
 
   // Function pointers to entry points into the plugin.
   PluginEntryPoints entry_points_;
 
   DISALLOW_COPY_AND_ASSIGN(PluginLib);
 };
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace NPAPI
 
-#endif  // WEBKIT_PLUGINS_NPAPI_PLUGIN_LIB_H_
+#endif  // WEBKIT_GLUE_PLUGINS_PLUGIN_LIB_H_