Convert to new enter method

ppapi/thunk/ppb_tcp_socket_private_thunk.cc

Index: ppapi/thunk/ppb_tcp_socket_private_thunk.cc
diff --git a/ppapi/thunk/ppb_tcp_socket_private_thunk.cc b/ppapi/thunk/ppb_tcp_socket_private_thunk.cc
index 9085e9bf55c89a924edf709fe1d622f1fdab42fc..3997d080d1053c0d81607f31279618303f062a40 100644
--- a/ppapi/thunk/ppb_tcp_socket_private_thunk.cc
+++ b/ppapi/thunk/ppb_tcp_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_tcp_socket_private.h"
-#include "ppapi/thunk/common.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/thunk.h"
 #include "ppapi/thunk/ppb_tcp_socket_private_api.h"
@@ -16,6 +15,8 @@ namespace thunk {
 
 namespace {
 
+typedef EnterResource<PPB_TCPSocket_Private_API> EnterTCP;
+
 PP_Resource Create(PP_Instance instance) {
   EnterFunction<ResourceCreationAPI> enter(instance, true);
   if (enter.failed())
@@ -24,7 +25,7 @@ PP_Resource Create(PP_Instance instance) {
 }
 
 PP_Bool IsTCPSocket(PP_Resource resource) {
-  EnterResource<PPB_TCPSocket_Private_API> enter(resource, false);
+  EnterTCP enter(resource, false);
   return PP_FromBool(enter.succeeded());
 }
 
@@ -32,26 +33,24 @@ int32_t Connect(PP_Resource tcp_socket,
                 const char* host,
                 uint16_t port,
                 PP_CompletionCallback callback) {
-  EnterResource<PPB_TCPSocket_Private_API> enter(tcp_socket, true);
+  EnterTCP enter(tcp_socket, callback, true);
   if (enter.failed())
-    return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
-  int32_t result = enter.object()->Connect(host, port, callback);
-  return MayForceCallback(callback, result);
+    return enter.retval();
+  return enter.SetResult(enter.object()->Connect(host, port, callback));
 }
 
 int32_t ConnectWithNetAddress(PP_Resource tcp_socket,
                               const PP_NetAddress_Private* addr,
                               PP_CompletionCallback callback) {
-  EnterResource<PPB_TCPSocket_Private_API> enter(tcp_socket, true);
+  EnterTCP enter(tcp_socket, callback, true);
   if (enter.failed())
-    return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
-  int32_t result = enter.object()->ConnectWithNetAddress(addr, callback);
-  return MayForceCallback(callback, result);
+    return enter.retval();
+  return enter.SetResult(enter.object()->ConnectWithNetAddress(addr, callback));
 }
 
 PP_Bool GetLocalAddress(PP_Resource tcp_socket,
                         PP_NetAddress_Private* local_addr) {
-  EnterResource<PPB_TCPSocket_Private_API> enter(tcp_socket, true);
+  EnterTCP enter(tcp_socket, true);
   if (enter.failed())
     return PP_FALSE;
   return enter.object()->GetLocalAddress(local_addr);
@@ -59,7 +58,7 @@ PP_Bool GetLocalAddress(PP_Resource tcp_socket,
 
 PP_Bool GetRemoteAddress(PP_Resource tcp_socket,
                          PP_NetAddress_Private* remote_addr) {
-  EnterResource<PPB_TCPSocket_Private_API> enter(tcp_socket, true);
+  EnterTCP enter(tcp_socket, true);
   if (enter.failed())
     return PP_FALSE;
   return enter.object()->GetRemoteAddress(remote_addr);
@@ -69,38 +68,36 @@ int32_t SSLHandshake(PP_Resource tcp_socket,
                      const char* server_name,
                      uint16_t server_port,
                      PP_CompletionCallback callback) {
-  EnterResource<PPB_TCPSocket_Private_API> enter(tcp_socket, true);
+  EnterTCP enter(tcp_socket, callback, true);
   if (enter.failed())
-    return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
-  int32_t result = enter.object()->SSLHandshake(server_name, server_port,
-                                                callback);
-  return MayForceCallback(callback, result);
+    return enter.retval();
+  return enter.SetResult(enter.object()->SSLHandshake(server_name, server_port,
+                                                      callback));
 }
 
 int32_t Read(PP_Resource tcp_socket,
              char* buffer,
              int32_t bytes_to_read,
              PP_CompletionCallback callback) {
-  EnterResource<PPB_TCPSocket_Private_API> enter(tcp_socket, true);
+  EnterTCP enter(tcp_socket, callback, true);
   if (enter.failed())
-    return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
-  int32_t result = enter.object()->Read(buffer, bytes_to_read, callback);
-  return MayForceCallback(callback, result);
+    return enter.retval();
+  return enter.SetResult(enter.object()->Read(buffer, bytes_to_read, callback));
 }
 
 int32_t Write(PP_Resource tcp_socket,
               const char* buffer,
               int32_t bytes_to_write,
               PP_CompletionCallback callback) {
-  EnterResource<PPB_TCPSocket_Private_API> enter(tcp_socket, true);
+  EnterTCP enter(tcp_socket, callback, true);
   if (enter.failed())
-    return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
-  int32_t result = enter.object()->Write(buffer, bytes_to_write, callback);
-  return MayForceCallback(callback, result);
+    return enter.retval();
+  return enter.SetResult(enter.object()->Write(buffer, bytes_to_write,
+                                               callback));
 }
 
 void Disconnect(PP_Resource tcp_socket) {
-  EnterResource<PPB_TCPSocket_Private_API> enter(tcp_socket, true);
+  EnterTCP enter(tcp_socket, true);
   if (enter.succeeded())
     enter.object()->Disconnect();
 }