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

chrome/plugin/webplugin_delegate_stub.h

Index: chrome/plugin/webplugin_delegate_stub.h
diff --git a/chrome/plugin/webplugin_delegate_stub.h b/chrome/plugin/webplugin_delegate_stub.h
index c310467a637e07eafd197437bd8235310230c1c5..cbd2c97f90fe89eaab942a0b0c8f0f7b861e7bd8 100644
--- a/chrome/plugin/webplugin_delegate_stub.h
+++ b/chrome/plugin/webplugin_delegate_stub.h
@@ -29,11 +29,7 @@ namespace WebKit {
 class WebInputEvent;
 }
 
-namespace webkit {
-namespace npapi {
 class WebPluginDelegateImpl;
-}
-}
 
 // Converts the IPC messages from WebPluginDelegateProxy into calls to the
 // actual WebPluginDelegateImpl object.
@@ -115,7 +111,7 @@ class WebPluginDelegateStub : public IPC::Channel::Listener,
 
   scoped_refptr<PluginChannel> channel_;
 
-  webkit::npapi::WebPluginDelegateImpl* delegate_;
+  WebPluginDelegateImpl* delegate_;
   WebPluginProxy* webplugin_;
   bool in_destructor_;