Hide knowledge of webkit::ppapi::Plugin from chrome. This is part of moving ppapi implementation fr…

webkit/plugins/ppapi/ppapi_plugin_instance.h

Index: webkit/plugins/ppapi/ppapi_plugin_instance.h
===================================================================
--- webkit/plugins/ppapi/ppapi_plugin_instance.h	(revision 213146)
+++ webkit/plugins/ppapi/ppapi_plugin_instance.h	(working copy)
@@ -35,7 +35,6 @@
 #include "ppapi/c/ppp_messaging.h"
 #include "ppapi/c/ppp_mouse_lock.h"
 #include "ppapi/c/private/ppb_content_decryptor_private.h"
-#include "ppapi/c/private/ppb_nacl_private.h"
 #include "ppapi/c/private/ppp_instance_private.h"
 #include "ppapi/shared_impl/ppb_instance_shared.h"
 #include "ppapi/shared_impl/ppb_view_shared.h"
@@ -63,6 +62,10 @@
 class SkBitmap;
 class TransportDIB;
 
+namespace IPC {
+struct ChannelHandle;
+}
+
 namespace WebKit {
 class WebInputEvent;
 class WebLayer;
@@ -89,9 +92,10 @@
 }
 
 namespace ppapi {
+class PpapiPermissions;
+class Resource;
 struct InputEventData;
 struct PPP_Instance_Combined;
-class Resource;
 struct URLRequestInfoData;
 }
 
@@ -498,7 +502,7 @@
   // DidCreate, DidChangeView, and HandleDocumentLoad (if necessary).
   // This should be used only when switching a trusted NaCl in-process instance

[bbudge, 2013/07/23 23:59:58]

s/NaCl//

   // to an untrusted NaCl out-of-process instance.
-  PP_NaClResult ResetAsProxied(scoped_refptr<PluginModule> module);
+  PP_ExternalPluginResult ResetAsProxied(scoped_refptr<PluginModule> module);
 
   // Checks whether this is a valid instance of the given module. After calling
   // ResetAsProxied above, a NaCl plugin instance's module changes, so external

[bbudge, 2013/07/23 23:59:58]

s/a NaCl/an external/

[jam, 2013/07/24 05:07:39]

Done.

@@ -523,6 +527,17 @@
   // Creates a PPB_ImageData given a Skia image.
   PP_Resource CreateImage(gfx::ImageSkia* source_image, float scale);
 
+  // Returns the location of this module.
+  base::FilePath GetModulePath();
+
+  // Switches this instance with one that uses the out of process IPC proxy.
+  PP_ExternalPluginResult SwitchToOutOfProcessProxy(
+      const base::FilePath& file_path,
+      ::ppapi::PpapiPermissions permissions,
+      const IPC::ChannelHandle& channel_handle,
+      base::ProcessId plugin_pid,
+      int plugin_child_id);
+
  private:
   friend class PpapiUnittest;