Convert to new enter method

ppapi/thunk/ppb_file_io_thunk.cc

Index: ppapi/thunk/ppb_file_io_thunk.cc
diff --git a/ppapi/thunk/ppb_file_io_thunk.cc b/ppapi/thunk/ppb_file_io_thunk.cc
index 52d4ea6305c283fe5f5bd06d6b5a5de06adf7e9d..a129a62f304fb8bbbadf4dd25d31f3d3242ef208 100644
--- a/ppapi/thunk/ppb_file_io_thunk.cc
+++ b/ppapi/thunk/ppb_file_io_thunk.cc
@@ -4,7 +4,6 @@
 
 #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_file_io_api.h"
@@ -15,15 +14,17 @@ namespace thunk {
 
 namespace {
 
+typedef EnterResource<PPB_FileIO_API> EnterFileIO;
+
 PP_Resource Create(PP_Instance instance) {
-  EnterFunction<ResourceCreationAPI> enter(instance, true);
+  EnterResourceCreation enter(instance);
   if (enter.failed())
     return 0;
   return enter.functions()->CreateFileIO(instance);
 }
 
 PP_Bool IsFileIO(PP_Resource resource) {
-  EnterResource<PPB_FileIO_API> enter(resource, false);
+  EnterFileIO enter(resource, false);
   return PP_FromBool(enter.succeeded());
 }
 
@@ -31,33 +32,30 @@ int32_t Open(PP_Resource file_io,
              PP_Resource file_ref,
              int32_t open_flags,
              PP_CompletionCallback callback) {
-  EnterResource<PPB_FileIO_API> enter(file_io, true);
+  EnterFileIO enter(file_io, callback, true);
   if (enter.failed())
-    return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
-  int32_t result = enter.object()->Open(file_ref, open_flags, callback);
-  return MayForceCallback(callback, result);
+    return enter.retval();
+  return enter.SetResult(enter.object()->Open(file_ref, open_flags, callback));
 }
 
 int32_t Query(PP_Resource file_io,
               PP_FileInfo* info,
               PP_CompletionCallback callback) {
-  EnterResource<PPB_FileIO_API> enter(file_io, true);
+  EnterFileIO enter(file_io, callback, true);
   if (enter.failed())
-    return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
-  int32_t result = enter.object()->Query(info, callback);
-  return MayForceCallback(callback, result);
+    return enter.retval();
+  return enter.SetResult(enter.object()->Query(info, callback));
 }
 
 int32_t Touch(PP_Resource file_io,
               PP_Time last_access_time,
               PP_Time last_modified_time,
               PP_CompletionCallback callback) {
-  EnterResource<PPB_FileIO_API> enter(file_io, true);
+  EnterFileIO enter(file_io, callback, true);
   if (enter.failed())
-    return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
-  int32_t result = enter.object()->Touch(last_access_time, last_modified_time,
-                                         callback);
-  return MayForceCallback(callback, result);
+    return enter.retval();
+  return enter.SetResult(enter.object()->Touch(
+      last_access_time, last_modified_time, callback));
 }
 
 int32_t Read(PP_Resource file_io,
@@ -65,12 +63,11 @@ int32_t Read(PP_Resource file_io,
              char* buffer,
              int32_t bytes_to_read,
              PP_CompletionCallback callback) {
-  EnterResource<PPB_FileIO_API> enter(file_io, true);
+  EnterFileIO enter(file_io, callback, true);
   if (enter.failed())
-    return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
-  int32_t result = enter.object()->Read(offset, buffer, bytes_to_read,
-                                        callback);
-  return MayForceCallback(callback, result);
+    return enter.retval();
+  return enter.SetResult(enter.object()->Read(offset, buffer, bytes_to_read,
+                                              callback));
 }
 
 int32_t Write(PP_Resource file_io,
@@ -78,35 +75,32 @@ int32_t Write(PP_Resource file_io,
               const char* buffer,
               int32_t bytes_to_write,
               PP_CompletionCallback callback) {
-  EnterResource<PPB_FileIO_API> enter(file_io, true);
+  EnterFileIO enter(file_io, callback, true);
   if (enter.failed())
-    return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
-  int32_t result = enter.object()->Write(offset, buffer, bytes_to_write,
-                                         callback);
-  return MayForceCallback(callback, result);
+    return enter.retval();
+  return enter.SetResult(enter.object()->Write(offset, buffer, bytes_to_write,
+                                               callback));
 }
 
 int32_t SetLength(PP_Resource file_io,
                   int64_t length,
                   PP_CompletionCallback callback) {
-  EnterResource<PPB_FileIO_API> enter(file_io, true);
+  EnterFileIO enter(file_io, callback, true);
   if (enter.failed())
-    return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
-  int32_t result = enter.object()->SetLength(length, callback);
-  return MayForceCallback(callback, result);
+    return enter.retval();
+  return enter.SetResult(enter.object()->SetLength(length, callback));
 }
 
 int32_t Flush(PP_Resource file_io,
               PP_CompletionCallback callback) {
-  EnterResource<PPB_FileIO_API> enter(file_io, true);
+  EnterFileIO enter(file_io, callback, true);
   if (enter.failed())
-    return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
-  int32_t result = enter.object()->Flush(callback);
-  return MayForceCallback(callback, result);
+    return enter.retval();
+  return enter.SetResult(enter.object()->Flush(callback));
 }
 
 void Close(PP_Resource file_io) {
-  EnterResource<PPB_FileIO_API> enter(file_io, true);
+  EnterFileIO enter(file_io, true);
   if (enter.succeeded())
     enter.object()->Close();
 }