Convert srpc definitions from using int64 to using PP_Instance, PP_Module, an...

src/shared/ppapi_proxy/ppp_rpc_client.cc

Index: src/shared/ppapi_proxy/ppp_rpc_client.cc
===================================================================
--- src/shared/ppapi_proxy/ppp_rpc_client.cc	(revision 4034)
+++ src/shared/ppapi_proxy/ppp_rpc_client.cc	(working copy)
@@ -17,6 +17,9 @@
 #include "native_client/src/include/portability.h"
 #endif  // __native_client__
 #include "native_client/src/shared/srpc/nacl_srpc.h"
+#include "ppapi/c/pp_instance.h"
+#include "ppapi/c/pp_module.h"
+#include "ppapi/c/pp_resource.h"
 
 NaClSrpcError ObjectStubRpcClient::HasProperty(
     NaClSrpcChannel* channel,
@@ -211,7 +214,7 @@
 NaClSrpcError PppRpcClient::PPP_InitializeModule(
     NaClSrpcChannel* channel,
     int32_t pid,
-    int64_t module,
+    PP_Module module,
     NaClSrpcImcDescType upcall_channel_desc,
     char* service_description,
     int32_t* nacl_pid,
@@ -256,7 +259,7 @@
 
 NaClSrpcError PppAudioDevRpcClient::PPP_Audio_Dev_StreamCreated(
     NaClSrpcChannel* channel,
-    int64_t instance,
+    PP_Instance instance,
     NaClSrpcImcDescType out_shm,
     int32_t out_shm_size,
     NaClSrpcImcDescType out_socket)  {
@@ -274,7 +277,7 @@
 
 NaClSrpcError PppInstanceRpcClient::PPP_Instance_DidCreate(
     NaClSrpcChannel* channel,
-    int64_t instance,
+    PP_Instance instance,
     int32_t argc,
     nacl_abi_size_t argn_bytes, char* argn,
     nacl_abi_size_t argv_bytes, char* argv,
@@ -294,7 +297,7 @@
 
 NaClSrpcError PppInstanceRpcClient::PPP_Instance_DidDestroy(
     NaClSrpcChannel* channel,
-    int64_t instance)  {
+    PP_Instance instance)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
       channel,
@@ -306,7 +309,7 @@
 
 NaClSrpcError PppInstanceRpcClient::PPP_Instance_DidChangeView(
     NaClSrpcChannel* channel,
-    int64_t instance,
+    PP_Instance instance,
     nacl_abi_size_t position_bytes, int32_t* position,
     nacl_abi_size_t clip_bytes, int32_t* clip)  {
   NaClSrpcError retval;
@@ -322,7 +325,7 @@
 
 NaClSrpcError PppInstanceRpcClient::PPP_Instance_DidChangeFocus(
     NaClSrpcChannel* channel,
-    int64_t instance,
+    PP_Instance instance,
     bool has_focus)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
@@ -336,7 +339,7 @@
 
 NaClSrpcError PppInstanceRpcClient::PPP_Instance_HandleInputEvent(
     NaClSrpcChannel* channel,
-    int64_t instance,
+    PP_Instance instance,
     nacl_abi_size_t event_data_bytes, char* event_data,
     int32_t* success)  {
   NaClSrpcError retval;
@@ -352,8 +355,8 @@
 
 NaClSrpcError PppInstanceRpcClient::PPP_Instance_HandleDocumentLoad(
     NaClSrpcChannel* channel,
-    int64_t instance,
-    int64_t url_loader,
+    PP_Instance instance,
+    PP_Resource url_loader,
     int32_t* success)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(
@@ -368,7 +371,7 @@
 
 NaClSrpcError PppInstanceRpcClient::PPP_Instance_GetInstanceObject(
     NaClSrpcChannel* channel,
-    int64_t instance,
+    PP_Instance instance,
     nacl_abi_size_t* capability_bytes, char* capability)  {
   NaClSrpcError retval;
   retval = NaClSrpcInvokeBySignature(