Add new MouseCursor interface for setting the mouse cursor.

ppapi/native_client/src/shared/ppapi_proxy/ppb_rpc_client.cc

Index: ppapi/native_client/src/shared/ppapi_proxy/ppb_rpc_client.cc
diff --git a/ppapi/native_client/src/shared/ppapi_proxy/ppb_rpc_client.cc b/ppapi/native_client/src/shared/ppapi_proxy/ppb_rpc_client.cc
index c869403721f291375a3f83871fc6c1ced6287f56..5f139eb7deb5c3fe5aaba13476fc30970e697e03 100644
--- a/ppapi/native_client/src/shared/ppapi_proxy/ppb_rpc_client.cc
+++ b/ppapi/native_client/src/shared/ppapi_proxy/ppb_rpc_client.cc
@@ -385,97 +385,6 @@ NaClSrpcError PpbCoreRpcClient::PPB_Core_CallOnMainThread(
   return retval;
 }
 
-NaClSrpcError PpbCursorControlRpcClient::PPB_CursorControl_SetCursor(
-    NaClSrpcChannel* channel,
-    PP_Instance instance,
-    int32_t type,
-    PP_Resource custom_image,
-    nacl_abi_size_t hot_spot_bytes, char* hot_spot,
-    int32_t* success)  {
-  VCHECK(ppapi_proxy::PPBCoreInterface()->IsMainThread(),
-         ("%s: PPAPI calls are not supported off the main thread\n",
-          __FUNCTION__));
-  NaClSrpcError retval;
-  retval = NaClSrpcInvokeBySignature(
-      channel,
-      "PPB_CursorControl_SetCursor:iiiC:i",
-      instance,
-      type,
-      custom_image,
-      hot_spot_bytes, hot_spot,
-      success
-  );
-  return retval;
-}
-
-NaClSrpcError PpbCursorControlRpcClient::PPB_CursorControl_LockCursor(
-    NaClSrpcChannel* channel,
-    PP_Instance instance,
-    int32_t* success)  {
-  VCHECK(ppapi_proxy::PPBCoreInterface()->IsMainThread(),
-         ("%s: PPAPI calls are not supported off the main thread\n",
-          __FUNCTION__));
-  NaClSrpcError retval;
-  retval = NaClSrpcInvokeBySignature(
-      channel,
-      "PPB_CursorControl_LockCursor:i:i",
-      instance,
-      success
-  );
-  return retval;
-}
-
-NaClSrpcError PpbCursorControlRpcClient::PPB_CursorControl_UnlockCursor(
-    NaClSrpcChannel* channel,
-    PP_Instance instance,
-    int32_t* success)  {
-  VCHECK(ppapi_proxy::PPBCoreInterface()->IsMainThread(),
-         ("%s: PPAPI calls are not supported off the main thread\n",
-          __FUNCTION__));
-  NaClSrpcError retval;
-  retval = NaClSrpcInvokeBySignature(
-      channel,
-      "PPB_CursorControl_UnlockCursor:i:i",
-      instance,
-      success
-  );
-  return retval;
-}
-
-NaClSrpcError PpbCursorControlRpcClient::PPB_CursorControl_HasCursorLock(
-    NaClSrpcChannel* channel,
-    PP_Instance instance,
-    int32_t* success)  {
-  VCHECK(ppapi_proxy::PPBCoreInterface()->IsMainThread(),
-         ("%s: PPAPI calls are not supported off the main thread\n",
-          __FUNCTION__));
-  NaClSrpcError retval;
-  retval = NaClSrpcInvokeBySignature(
-      channel,
-      "PPB_CursorControl_HasCursorLock:i:i",
-      instance,
-      success
-  );
-  return retval;
-}
-
-NaClSrpcError PpbCursorControlRpcClient::PPB_CursorControl_CanLockCursor(
-    NaClSrpcChannel* channel,
-    PP_Instance instance,
-    int32_t* success)  {
-  VCHECK(ppapi_proxy::PPBCoreInterface()->IsMainThread(),
-         ("%s: PPAPI calls are not supported off the main thread\n",
-          __FUNCTION__));
-  NaClSrpcError retval;
-  retval = NaClSrpcInvokeBySignature(
-      channel,
-      "PPB_CursorControl_CanLockCursor:i:i",
-      instance,
-      success
-  );
-  return retval;
-}
-
 NaClSrpcError PpbFileIORpcClient::PPB_FileIO_Create(
     NaClSrpcChannel* channel,
     PP_Instance instance,
@@ -2047,6 +1956,29 @@ NaClSrpcError PpbMessagingRpcClient::PPB_Messaging_PostMessage(
   return retval;
 }
 
+NaClSrpcError PpbMouseCursorRpcClient::PPB_MouseCursor_SetCursor(
+    NaClSrpcChannel* channel,
+    PP_Instance instance,
+    int32_t type,
+    PP_Resource custom_image,
+    nacl_abi_size_t hot_spot_bytes, char* hot_spot,
+    int32_t* success)  {
+  VCHECK(ppapi_proxy::PPBCoreInterface()->IsMainThread(),
+         ("%s: PPAPI calls are not supported off the main thread\n",
+          __FUNCTION__));
+  NaClSrpcError retval;
+  retval = NaClSrpcInvokeBySignature(
+      channel,
+      "PPB_MouseCursor_SetCursor:iiiC:i",
+      instance,
+      type,
+      custom_image,
+      hot_spot_bytes, hot_spot,
+      success
+  );
+  return retval;
+}
+
 NaClSrpcError PpbMouseLockRpcClient::PPB_MouseLock_LockMouse(
     NaClSrpcChannel* channel,
     PP_Instance instance,