Convert to new enter method

ppapi/thunk/ppb_transport_thunk.cc

 // Copyright (c) 2012 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #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_transport_api.h"
 #include "ppapi/thunk/resource_creation_api.h"
 
 namespace ppapi {
 namespace thunk {
 
 namespace {
 
@@ skipping 16 matching lines @@
   EnterTransport enter(transport, true);
   if (enter.failed())
     return PP_FALSE;
   return enter.object()->IsWritable();
 }
 
 int32_t SetProperty(PP_Resource transport, PP_TransportProperty property,
                    PP_Var value) {
   EnterTransport enter(transport, true);
   if (enter.failed())
-    return PP_ERROR_BADRESOURCE;
+    return enter.retval();
   return enter.object()->SetProperty(property, value);
 }
 
 int32_t Connect(PP_Resource transport, PP_CompletionCallback callback) {
-  EnterTransport enter(transport, true);
+  EnterTransport enter(transport, callback, true);
   if (enter.failed())
-    return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
-  int32_t result = enter.object()->Connect(callback);
-  return MayForceCallback(callback, result);
+    return enter.retval();
+  return enter.SetResult(enter.object()->Connect(callback));
 }
 
 int32_t GetNextAddress(PP_Resource transport, PP_Var* address,
                        PP_CompletionCallback callback) {
-  EnterTransport enter(transport, true);
+  EnterTransport enter(transport, callback, true);
   if (enter.failed())
-    return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
-  int32_t result = enter.object()->GetNextAddress(address, callback);
-  return MayForceCallback(callback, result);
+    return enter.retval();
+  return enter.SetResult(enter.object()->GetNextAddress(address, callback));
 }
 
 int32_t ReceiveRemoteAddress(PP_Resource transport, PP_Var address) {
   EnterTransport enter(transport, true);
   if (enter.failed())
-    return PP_ERROR_BADRESOURCE;
+    return enter.retval();
   return enter.object()->ReceiveRemoteAddress(address);
 }
 
 int32_t Recv(PP_Resource transport, void* data, uint32_t len,
              PP_CompletionCallback callback) {
-  EnterTransport enter(transport, true);
+  EnterTransport enter(transport, callback, true);
   if (enter.failed())
-    return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
-  int32_t result = enter.object()->Recv(data, len, callback);
-  return MayForceCallback(callback, result);
+    return enter.retval();
+  return enter.SetResult(enter.object()->Recv(data, len, callback));
 }
 
 int32_t Send(PP_Resource transport, const void* data, uint32_t len,
              PP_CompletionCallback callback) {
   EnterTransport enter(transport, true);

[yzshen1, 2012/01/25 19:11:01]

callback, please.

   if (enter.failed())
-    return MayForceCallback(callback, PP_ERROR_BADRESOURCE);
-  int32_t result = enter.object()->Send(data, len, callback);
-  return MayForceCallback(callback, result);
+    return enter.retval();
+  return enter.SetResult(enter.object()->Send(data, len, callback));
 }
 
 int32_t Close(PP_Resource transport) {
   EnterTransport enter(transport, true);
   if (enter.failed())
-    return PP_ERROR_BADRESOURCE;
+    return enter.retval();
   return enter.object()->Close();
 }
 
 const PPB_Transport_Dev g_ppb_transport_thunk = {
   &Create,
   &IsTransport,
   &IsWritable,
   &SetProperty,
   &Connect,
   &GetNextAddress,
   &ReceiveRemoteAddress,
   &Recv,
   &Send,
   &Close,
 };
 
 }  // namespace
 
 const PPB_Transport_Dev_0_7* GetPPB_Transport_Dev_0_7_Thunk() {
   return &g_ppb_transport_thunk;
 }
 
 }  // namespace thunk
 }  // namespace ppapi