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

ppapi/thunk/enter.h

 // Copyright (c) 2011 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.
 
 #ifndef PPAPI_THUNK_ENTER_H_
 #define PPAPI_THUNK_ENTER_H_
 
 #include "base/basictypes.h"
 #include "ppapi/c/pp_resource.h"
 #include "ppapi/proxy/interface_id.h"
 #include "ppapi/shared_impl/function_group_base.h"
 #include "ppapi/shared_impl/resource.h"
 #include "ppapi/shared_impl/tracker_base.h"
 #include "ppapi/shared_impl/resource_tracker.h"
+#include "ppapi/thunk/ppapi_thunk_export.h"
 
 namespace ppapi {
 namespace thunk {
 
 // EnterHost* helper objects: These objects wrap a call from the C PPAPI into
 // the internal implementation. They make sure the lock is acquired and will
 // automatically set up some stuff for you.
 //
 // You should always check whether the enter succeeded before using the object.
 // If this fails, then the instance or resource ID supplied was invalid.
@@ skipping 96 matching lines @@
 // TODO(brettw) actually implement locks, this is just a placeholder for now.
 template<typename ResourceT>
 class EnterResourceNoLock : public EnterResource<ResourceT> {
  public:
   EnterResourceNoLock(PP_Resource resource, bool report_error)
       : EnterResource<ResourceT>(resource, report_error) {
     // TODO(brettw) assert the lock is held.
   }
 };
 
+// Simpler wrapper to enter the resource creation API. This is used for every
+// class so we have this helper function to save template instantiations and
+// typing.
+PPAPI_THUNK_EXPORT class EnterResourceCreation
+    : public EnterFunctionNoLock<ResourceCreationAPI> {
+ public:
+  EnterResourceCreation(PP_Instance instance);
+  ~EnterResourceCreation();
+};
+
+// Simpler wrapper to enter the instance API from proxy code. This is used for
+// many interfaces so we have this helper function to save template
+// instantiations and typing.
+PPAPI_THUNK_EXPORT class EnterInstance
+    : public EnterFunctionNoLock<PPB_Instance_FunctionAPI> {
+ public:
+  EnterInstance(PP_Instance instance);
+  ~EnterInstance();
+};
+
 }  // namespace thunk
 }  // namespace ppapi
 
 #endif  // PPAPI_THUNK_ENTER_H_