Convert to new enter method

ppapi/thunk/ppb_flash_net_connector_thunk.cc

Index: ppapi/thunk/ppb_flash_net_connector_thunk.cc
diff --git a/ppapi/thunk/ppb_flash_net_connector_thunk.cc b/ppapi/thunk/ppb_flash_net_connector_thunk.cc
index 35ba2f0e854d389504f27aeb56350862bdfb4660..7093bf1cf7710c31d3e7171bcb12baa90bcea7c2 100644
--- a/ppapi/thunk/ppb_flash_net_connector_thunk.cc
+++ b/ppapi/thunk/ppb_flash_net_connector_thunk.cc
@@ -5,7 +5,6 @@
 #include "ppapi/c/private/ppb_flash_net_connector.h"
 #include "ppapi/c/pp_completion_callback.h"
 #include "ppapi/c/pp_errors.h"
-#include "ppapi/thunk/common.h"
 #include "ppapi/thunk/enter.h"
 #include "ppapi/thunk/thunk.h"
 #include "ppapi/thunk/ppb_flash_net_connector_api.h"
@@ -16,15 +15,17 @@ namespace thunk {
 
 namespace {
 
+typedef EnterResource<PPB_Flash_NetConnector_API> EnterNetConnector;
+
 PP_Resource Create(PP_Instance instance) {
-  EnterFunction<ResourceCreationAPI> enter(instance, true);
+  EnterResourceCreation enter(instance);
   if (enter.failed())
     return 0;
   return enter.functions()->CreateFlashNetConnector(instance);
 }
 
 PP_Bool IsFlashNetConnector(PP_Resource resource) {
-  EnterResource<PPB_Flash_NetConnector_API> enter(resource, false);
+  EnterNetConnector enter(resource, false);
   return PP_FromBool(enter.succeeded());
 }
 
@@ -35,13 +36,11 @@ int32_t ConnectTcp(PP_Resource resource,
                    PP_NetAddress_Private* local_addr_out,
                    PP_NetAddress_Private* remote_addr_out,
                    PP_CompletionCallback callback) {
-  EnterResource<PPB_Flash_NetConnector_API> enter(resource, true);
+  EnterNetConnector enter(resource, callback, true);
   if (enter.failed())
-    return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
-  int32_t result =
-      enter.object()->ConnectTcp(host, port, socket_out, local_addr_out,
-                                 remote_addr_out, callback);
-  return MayForceCallback(callback, result);
+    return enter.retval();
+  return enter.SetResult(enter.object()->ConnectTcp(
+      host, port, socket_out, local_addr_out, remote_addr_out, callback));
 }
 
 int32_t ConnectTcpAddress(PP_Resource resource,
@@ -50,13 +49,11 @@ int32_t ConnectTcpAddress(PP_Resource resource,
                           PP_NetAddress_Private* local_addr_out,
                           PP_NetAddress_Private* remote_addr_out,
                           PP_CompletionCallback callback) {
-  EnterResource<PPB_Flash_NetConnector_API> enter(resource, true);
+  EnterNetConnector enter(resource, callback, true);
   if (enter.failed())
-    return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
-  int32_t result =
-      enter.object()->ConnectTcpAddress(addr, socket_out, local_addr_out,
-                                           remote_addr_out, callback);
-  return MayForceCallback(callback, result);
+    return enter.retval();
+  return enter.SetResult(enter.object()->ConnectTcpAddress(
+      addr, socket_out, local_addr_out, remote_addr_out, callback));
 }
 
 const PPB_Flash_NetConnector g_ppb_flash_net_connector_thunk = {