Convert to new enter method

ppapi/thunk/ppb_broker_thunk.cc

Index: ppapi/thunk/ppb_broker_thunk.cc
diff --git a/ppapi/thunk/ppb_broker_thunk.cc b/ppapi/thunk/ppb_broker_thunk.cc
index 6b3f9362da4e7b5cb7da179f86a1e65828d384be..a3ef579d789c9d0b96f8ab355039532312ce01f9 100644
--- a/ppapi/thunk/ppb_broker_thunk.cc
+++ b/ppapi/thunk/ppb_broker_thunk.cc
@@ -4,7 +4,6 @@
 
 #include "ppapi/c/trusted/ppb_broker_trusted.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_broker_api.h"
@@ -28,18 +27,17 @@ PP_Bool IsBrokerTrusted(PP_Resource resource) {
 }
 
 int32_t Connect(PP_Resource resource,
-                PP_CompletionCallback connect_callback) {
-  EnterResource<PPB_Broker_API> enter(resource, true);
+                PP_CompletionCallback callback) {
+  EnterResource<PPB_Broker_API> enter(resource, callback, true);
   if (enter.failed())
-    return MayForceCallback(connect_callback, PP_ERROR_BADRESOURCE);
-  int32_t result = enter.object()->Connect(connect_callback);
-  return MayForceCallback(connect_callback, result);
+    return enter.retval();
+  return enter.SetResult(enter.object()->Connect(callback));
 }
 
 int32_t GetHandle(PP_Resource resource, int32_t* handle) {
   EnterResource<PPB_Broker_API> enter(resource, true);
   if (enter.failed())
-    return PP_ERROR_BADRESOURCE;
+    return enter.retval();
   return enter.object()->GetHandle(handle);
 }