Move webkit/plugins/ppapi to content/renderer/pepper.

content/renderer/pepper/plugin_delegate.h

Index: content/renderer/pepper/plugin_delegate.h
===================================================================
--- content/renderer/pepper/plugin_delegate.h	(revision 213482)
+++ content/renderer/pepper/plugin_delegate.h	(working copy)
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef WEBKIT_PLUGINS_PPAPI_PLUGIN_DELEGATE_H_
-#define WEBKIT_PLUGINS_PPAPI_PLUGIN_DELEGATE_H_
+#ifndef CONTENT_RENDERER_PEPPER_PLUGIN_DELEGATE_H_
+#define CONTENT_RENDERER_PEPPER_PLUGIN_DELEGATE_H_
 
 #include <string>
 #include <vector>
@@ -16,6 +16,7 @@
 #include "base/process.h"
 #include "base/sync_socket.h"
 #include "base/time/time.h"
+#include "content/common/content_export.h"
 #include "ipc/ipc_platform_file.h"
 #include "media/video/capture/video_capture.h"
 #include "media/video/video_decode_accelerator.h"
@@ -36,7 +37,6 @@
 #include "url/gurl.h"
 #include "webkit/common/fileapi/file_system_types.h"
 #include "webkit/common/quota/quota_types.h"
-#include "webkit/plugins/webkit_plugins_export.h"
 
 class GURL;
 class SkBitmap;
@@ -122,26 +122,6 @@
 // PPAPI plugins.
 class PluginDelegate {
  public:
-  // This interface is used for the PluginModule to tell the code in charge of
-  // re-using modules which modules currently exist.
-  //
-  // It is different than the other interfaces, which are scoped to the
-  // lifetime of the plugin instance. The implementor of this interface must
-  // outlive all plugin modules, and is in practice a singleton
-  // (PepperPluginRegistry). This requirement means we can't do the obvious
-  // thing and just have a PluginDelegate call for this purpose (when the
-  // module is being deleted, we know there are no more PluginInstances that
-  // have PluginDelegates).
-  class ModuleLifetime {
-   public:
-    // Notification that the given plugin object is no longer usable. It either
-    // indicates the module was deleted, or that it has crashed.
-    //
-    // This can be called from the module's destructor, so you should not
-    // dereference the given pointer.
-    virtual void PluginModuleDead(PluginModule* dead_module) = 0;
-  };
-
   // This class is implemented by the PluginDelegate implementation and is
   // designed to manage the lifetime and communication with the proxy's
   // HostDispatcher for out-of-process PPAPI plugins.
@@ -193,7 +173,7 @@
     virtual TransportDIB* GetTransportDIB() const = 0;
   };
 
-  class WEBKIT_PLUGINS_EXPORT PlatformGraphics2D {
+  class CONTENT_EXPORT PlatformGraphics2D {
    public:
     virtual ~PlatformGraphics2D() {}
 
@@ -709,4 +689,4 @@
 }  // namespace ppapi
 }  // namespace webkit
 
-#endif  // WEBKIT_PLUGINS_PPAPI_PLUGIN_DELEGATE_H_
+#endif  // CONTENT_RENDERER_PEPPER_PLUGIN_DELEGATE_H_