Convert to new enter method

ppapi/thunk/ppb_udp_socket_private_thunk.cc

Index: ppapi/thunk/ppb_udp_socket_private_thunk.cc
diff --git a/ppapi/thunk/ppb_udp_socket_private_thunk.cc b/ppapi/thunk/ppb_udp_socket_private_thunk.cc
index 60e95fe9f7e974f8a15752d97079504645f09103..9ee8b9dc0f5cd16ef0228d0ed8849114dce01916 100644
--- a/ppapi/thunk/ppb_udp_socket_private_thunk.cc
+++ b/ppapi/thunk/ppb_udp_socket_private_thunk.cc
@@ -5,7 +5,6 @@
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
 #include "ppapi/c/private/ppb_udp_socket_private.h"
-#include "ppapi/thunk/common.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/ppb_udp_socket_private_api.h"
 #include "ppapi/thunk/resource_creation_api.h"
@@ -16,6 +15,8 @@ namespace thunk {
 
 namespace {
 
+typedef EnterResource<PPB_UDPSocket_Private_API> EnterUDP;
+
 PP_Resource Create(PP_Instance instance) {
   EnterFunction<ResourceCreationAPI> enter(instance, true);
   if (enter.failed())
@@ -24,36 +25,32 @@ PP_Resource Create(PP_Instance instance) {
 }
 
 PP_Bool IsUDPSocket(PP_Resource resource) {
-  EnterResource<PPB_UDPSocket_Private_API> enter(resource, false);
+  EnterUDP enter(resource, false);
   return PP_FromBool(enter.succeeded());
 }
 
 int32_t Bind(PP_Resource udp_socket,
              const PP_NetAddress_Private *addr,
              PP_CompletionCallback callback) {
-  EnterResource<PPB_UDPSocket_Private_API> enter(udp_socket, true);
+  EnterUDP enter(udp_socket, callback, true);
   if (enter.failed())
-    return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
-  int32_t result = enter.object()->Bind(addr, callback);
-  return MayForceCallback(callback, result);
+    return enter.retval();
+  return enter.SetResult(enter.object()->Bind(addr, callback));
 }
 
 int32_t RecvFrom(PP_Resource udp_socket,
                  char* buffer,
                  int32_t num_bytes,
                  PP_CompletionCallback callback) {
-  EnterResource<PPB_UDPSocket_Private_API> enter(udp_socket, true);
+  EnterUDP enter(udp_socket, callback, true);
   if (enter.failed())
-    return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
-  int32_t result = enter.object()->RecvFrom(buffer,
-                                            num_bytes,
-                                            callback);
-  return MayForceCallback(callback, result);
+    return enter.retval();
+  return enter.SetResult(enter.object()->RecvFrom(buffer, num_bytes, callback));
 }
 
 PP_Bool GetRecvFromAddress(PP_Resource udp_socket,
                            PP_NetAddress_Private* addr) {
-  EnterResource<PPB_UDPSocket_Private_API> enter(udp_socket, true);
+  EnterUDP enter(udp_socket, true);
   if (enter.failed())
     return PP_FALSE;
   return enter.object()->GetRecvFromAddress(addr);
@@ -64,15 +61,15 @@ int32_t SendTo(PP_Resource udp_socket,
                int32_t num_bytes,
                const PP_NetAddress_Private* addr,
                PP_CompletionCallback callback) {
-  EnterResource<PPB_UDPSocket_Private_API> enter(udp_socket, true);
+  EnterUDP enter(udp_socket, callback, true);
   if (enter.failed())
-    return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
-  int32_t result = enter.object()->SendTo(buffer, num_bytes, addr, callback);
-  return MayForceCallback(callback, result);
+    return enter.retval();
+  return enter.SetResult(enter.object()->SendTo(buffer, num_bytes, addr,
+                                                callback));
 }
 
 void Close(PP_Resource udp_socket) {
-  EnterResource<PPB_UDPSocket_Private_API> enter(udp_socket, true);
+  EnterUDP enter(udp_socket, true);
   if (enter.succeeded())
     enter.object()->Close();
 }