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

chrome/renderer/webplugin_delegate_pepper.h

Index: chrome/renderer/webplugin_delegate_pepper.h
diff --git a/chrome/renderer/webplugin_delegate_pepper.h b/chrome/renderer/webplugin_delegate_pepper.h
index cfe34a1a504fc23bf866a9507cb3475bd832ab24..628542481572c5a9b981fbed943e70e8e4480b3d 100644
--- a/chrome/renderer/webplugin_delegate_pepper.h
+++ b/chrome/renderer/webplugin_delegate_pepper.h
@@ -22,19 +22,21 @@
 #include "third_party/npapi/bindings/npapi.h"
 #include "third_party/skia/include/core/SkBitmap.h"
 #include "third_party/WebKit/WebKit/chromium/public/WebFileChooserCompletion.h"
-#include "webkit/glue/plugins/webplugin_delegate.h"
+#include "webkit/plugins/npapi/webplugin_delegate.h"
 
 class FilePath;
 class RenderView;
 class WebCursor;
 class WebPluginDelegateProxy;
 
-namespace NPAPI {
+namespace webkit {
+namespace npapi {
 class PluginInstance;
 }
+}
 
 // An implementation of WebPluginDelegate for Pepper in-process plugins.
-class WebPluginDelegatePepper : public webkit_glue::WebPluginDelegate,
+class WebPluginDelegatePepper : public webkit::npapi::WebPluginDelegate,
                                 public WebKit::WebFileChooserCompletion {
  public:
   static WebPluginDelegatePepper* Create(
@@ -42,7 +44,7 @@ class WebPluginDelegatePepper : public webkit_glue::WebPluginDelegate,
       const std::string& mime_type,
       const base::WeakPtr<RenderView>& render_view);
 
-  NPAPI::PluginInstance* instance() { return instance_.get(); }
+  webkit::npapi::PluginInstance* instance() { return instance_.get(); }
 
   // WebKit::WebFileChooserCompletion implementation.
   virtual void didChooseFile(
@@ -52,7 +54,7 @@ class WebPluginDelegatePepper : public webkit_glue::WebPluginDelegate,
   virtual bool Initialize(const GURL& url,
                           const std::vector<std::string>& arg_names,
                           const std::vector<std::string>& arg_values,
-                          webkit_glue::WebPlugin* plugin,
+                          webkit::npapi::WebPlugin* plugin,
                           bool load_manually);
   virtual void PluginDestroyed();
   virtual void UpdateGeometry(const gfx::Rect& window_rect,
@@ -79,9 +81,9 @@ class WebPluginDelegatePepper : public webkit_glue::WebPluginDelegate,
   virtual void DidFinishManualLoading();
   virtual void DidManualLoadFail();
   virtual void InstallMissingPlugin();
-  virtual webkit_glue::WebPluginResourceClient* CreateResourceClient(
+  virtual webkit::npapi::WebPluginResourceClient* CreateResourceClient(
       unsigned long resource_id, const GURL& url, int notify_id);
-  virtual webkit_glue::WebPluginResourceClient* CreateSeekableResourceClient(
+  virtual webkit::npapi::WebPluginResourceClient* CreateSeekableResourceClient(
       unsigned long resource_id, int range_request_id);
   virtual bool StartFind(const string16& search_text,
                          bool case_sensitive,
@@ -208,7 +210,7 @@ class WebPluginDelegatePepper : public webkit_glue::WebPluginDelegate,
  private:
   WebPluginDelegatePepper(
       const base::WeakPtr<RenderView>& render_view,
-      NPAPI::PluginInstance *instance);
+      webkit::npapi::PluginInstance *instance);
   ~WebPluginDelegatePepper();
 
   // Set a task that calls the repaint callback the next time the window
@@ -275,8 +277,8 @@ class WebPluginDelegatePepper : public webkit_glue::WebPluginDelegate,
 
   base::WeakPtr<RenderView> render_view_;
 
-  webkit_glue::WebPlugin* plugin_;
-  scoped_refptr<NPAPI::PluginInstance> instance_;
+  webkit::npapi::WebPlugin* plugin_;
+  scoped_refptr<webkit::npapi::PluginInstance> instance_;
 
   NPWindow window_;
   gfx::Rect window_rect_;