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

webkit/glue/plugins/plugin_host.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.
 
 // TODO: Need mechanism to cleanup the static instance
 
-#ifndef WEBKIT_PLUGINS_NPAPI_PLUGIN_HOST_H_
-#define WEBKIT_PLUGINS_NPAPI_PLUGIN_HOST_H_
+#ifndef WEBKIT_GLUE_PLUGIN_PLUGIN_HOST_H__
+#define WEBKIT_GLUE_PLUGIN_PLUGIN_HOST_H__
 
 #include <string>
 #include <vector>
 
 #include "base/ref_counted.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/nphostapi.h"
 
-namespace webkit {
-namespace npapi {
-
+namespace NPAPI
+{
 class PluginInstance;
 
 // The Plugin Host implements the NPN_xxx functions for NPAPI plugins.
 // These are the functions exposed from the Plugin Host for use
 // by the Plugin.
 //
 // The PluginHost is managed as a singleton.  This isn't strictly
 // necessary, but since the callback functions are all global C
 // functions, there is really no point in having per-instance PluginHosts.
 class PluginHost : public base::RefCounted<PluginHost> {
@@ skipping 22 matching lines @@
 
   virtual ~PluginHost();
 
   PluginHost();
   void InitializeHostFuncs();
   static scoped_refptr<PluginHost> singleton_;
   NPNetscapeFuncs host_funcs_;
   DISALLOW_COPY_AND_ASSIGN(PluginHost);
 };
 
-}  // namespace npapi
-}  // namespace webkit
+} // namespace NPAPI
 
-#endif  // WEBKIT_PLUGINS_NPAPI_PLUGIN_HOST_H_
+#endif  // WEBKIT_GLUE_PLUGIN_PLUGIN_HOST_H__