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

webkit/glue/plugins/webplugin_delegate.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_WEBPLUGIN_DELEGATE_H_
-#define WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_DELEGATE_H_
+#ifndef WEBKIT_GLUE_WEBPLUGIN_DELEGATE_H_
+#define WEBKIT_GLUE_WEBPLUGIN_DELEGATE_H_
 
 #include <string>
 #include <vector>
 
 #include "base/string16.h"
 #include "build/build_config.h"
 #include "gfx/native_widget_types.h"
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/npapi/bindings/npapi_extensions.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebCanvas.h"
-#include "webkit/plugins/npapi/webplugin_2d_device_delegate.h"
-#include "webkit/plugins/npapi/webplugin_3d_device_delegate.h"
-#include "webkit/plugins/npapi/webplugin_audio_device_delegate.h"
-#include "webkit/plugins/npapi/webplugin_file_delegate.h"
-#include "webkit/plugins/npapi/webplugin_print_delegate.h"
+#include "webkit/glue/plugins/webplugin_2d_device_delegate.h"
+#include "webkit/glue/plugins/webplugin_3d_device_delegate.h"
+#include "webkit/glue/plugins/webplugin_audio_device_delegate.h"
+#include "webkit/glue/plugins/webplugin_file_delegate.h"
+#include "webkit/glue/plugins/webplugin_print_delegate.h"
 
 class FilePath;
 class GURL;
 struct NPObject;
 
 namespace WebKit {
 class WebInputEvent;
 struct WebCursorInfo;
 }
 
 namespace gfx {
 class Rect;
 }
 
-namespace webkit {
-namespace npapi {
+namespace webkit_glue {
 
 class WebPlugin;
 class WebPluginResourceClient;
 
 // This is the interface that a plugin implementation needs to provide.
 class WebPluginDelegate : public WebPlugin2DDeviceDelegate,
                           public WebPlugin3DDeviceDelegate,
                           public WebPluginAudioDeviceDelegate,
                           public WebPluginPrintDelegate,
                           public WebPluginFileDelegate {
@@ skipping 107 matching lines @@
 
   // Used for zooming of full page plugins.  0 means reset, while -1 means zoom
   // out and +1 means zoom in.
   virtual void SetZoomFactor(float scale, bool text_only) {}
   // Gets the selected text, if any.
   virtual bool HasSelection() const;
   virtual string16 GetSelectionAsText() const;
   virtual string16 GetSelectionAsMarkup() const;
 };
 
-}  // namespace npapi
-}  // namespace webkit
+}  // namespace webkit_glue
 
-#endif  // WEBKIT_PLUGINS_NPAPI_WEBPLUGIN_DELEGATE_H_
+#endif  // WEBKIT_GLUE_WEBPLUGIN_DELEGATE_H_