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

chrome/plugin/webplugin_delegate_stub.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 CHROME_PLUGIN_WEBPLUGIN_DELEGATE_STUB_H_
 #define CHROME_PLUGIN_WEBPLUGIN_DELEGATE_STUB_H_
 #pragma once
 
 #include <string>
 #include <vector>
@@ skipping 11 matching lines @@
 class WebPluginProxy;
 struct PluginMsg_Init_Params;
 struct PluginMsg_DidReceiveResponseParams;
 struct PluginMsg_UpdateGeometry_Param;
 class WebCursor;
 
 namespace WebKit {
 class WebInputEvent;
 }
 
+namespace webkit {
+namespace npapi {
 class WebPluginDelegateImpl;
+}
+}
 
 // Converts the IPC messages from WebPluginDelegateProxy into calls to the
 // actual WebPluginDelegateImpl object.
 class WebPluginDelegateStub : public IPC::Channel::Listener,
                               public IPC::Message::Sender,
                               public base::RefCounted<WebPluginDelegateStub> {
  public:
   WebPluginDelegateStub(const std::string& mime_type, int instance_id,
                         PluginChannel* channel);
 
@@ skipping 61 matching lines @@
 
   void CreateSharedBuffer(uint32 size,
                           base::SharedMemory* shared_buf,
                           base::SharedMemoryHandle* remote_handle);
 
   std::string mime_type_;
   int instance_id_;
 
   scoped_refptr<PluginChannel> channel_;
 
-  WebPluginDelegateImpl* delegate_;
+  webkit::npapi::WebPluginDelegateImpl* delegate_;
   WebPluginProxy* webplugin_;
   bool in_destructor_;
 
   // The url of the main frame hosting the plugin.
   GURL page_url_;
 
 #if defined(ENABLE_GPU)
   // If this is the GPU plugin, the stub object that forwards to the
   // command buffer service.
   scoped_ptr<CommandBufferStub> command_buffer_stub_;
 
 #if defined(OS_MACOSX)
   // If this is a GPU-accelerated plug-in, we need to be able to receive a fake
   // window handle which is used for subsequent communication back to the
   // browser.
   void OnSetFakeAcceleratedSurfaceWindowHandle(gfx::PluginWindowHandle window);
 #endif
 
 #endif
 
   DISALLOW_IMPLICIT_CONSTRUCTORS(WebPluginDelegateStub);
 };
 
 #endif  // CHROME_PLUGIN_WEBPLUGIN_DELEGATE_STUB_H_