This patch tries to remove most of the manual registration for Pepper interfaces, and replaces it...

ppapi/proxy/enter_proxy.h

Index: ppapi/proxy/enter_proxy.h
===================================================================
--- ppapi/proxy/enter_proxy.h	(revision 100758)
+++ ppapi/proxy/enter_proxy.h	(working copy)
@@ -13,6 +13,11 @@
 #include "ppapi/thunk/enter.h"
 
 namespace ppapi {
+
+namespace thunk {
+class ResourceCreationAPI;
+}
+
 namespace proxy {
 
 // Wrapper around EnterResourceNoLock that takes a host resource. This is used
@@ -115,6 +120,21 @@
       RunCallback(PP_ERROR_BADRESOURCE);
   }
 
+  // For callbacks that take two extra parameters as a closure.
+  template<class CallbackFactory, typename Method, typename A, typename B>
+  EnterHostFromHostResourceForceCallback(
+      const HostResource& host_resource,
+      CallbackFactory& factory,
+      Method method,
+      const A& a,
+      const B& b)
+      : EnterHostFromHostResource<ResourceT>(host_resource),
+        needs_running_(true),
+        callback_(factory.NewOptionalCallback(method, a, b)) {
+    if (this->failed())
+      RunCallback(PP_ERROR_BADRESOURCE);
+  }
+
   ~EnterHostFromHostResourceForceCallback() {
     if (needs_running_) {
       NOTREACHED() << "Should always call SetResult except in the "