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

ppapi/proxy/interface_list.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_PROXY_INTERFACE_LIST_H_
 #define PPAPI_PROXY_INTERFACE_LIST_H_
 
 #include <map>
 #include <string>
 
@@ skipping 21 matching lines @@
 
   // Returns the interface pointer for the given browser or plugin interface,
   // or NULL if it's not supported.
   const void* GetInterfaceForPPB(const std::string& name) const;
   const void* GetInterfaceForPPP(const std::string& name) const;
 
  private:
   struct InterfaceInfo {
     InterfaceInfo()
         : id(INTERFACE_ID_NONE),
-          interface(NULL) {
+          iface(NULL) {
     }
     InterfaceInfo(InterfaceID in_id, const void* in_interface)
         : id(in_id),
-          interface(in_interface) {
+          iface(in_interface) {
     }
 
     InterfaceID id;
-    const void* interface;
+    const void* iface;
   };
 
   typedef std::map<std::string, InterfaceInfo> NameToInterfaceInfoMap;
 
   void AddProxy(InterfaceID id, InterfaceProxy::Factory factory);
 
-  void AddPPB(const char* name, InterfaceID id, const void* interface);
-  void AddPPP(const char* name, InterfaceID id, const void* interface);
+  void AddPPB(const char* name, InterfaceID id, const void* iface);
+  void AddPPP(const char* name, InterfaceID id, const void* iface);
 
   // Old-style add functions. These should be removed when the rest of the
   // proxies are converted over to using the new system.
   void AddPPB(const InterfaceProxy::Info* info);
   void AddPPP(const InterfaceProxy::Info* info);
 
   NameToInterfaceInfoMap name_to_browser_info_;
   NameToInterfaceInfoMap name_to_plugin_info_;
 
   InterfaceProxy::Factory id_to_factory_[INTERFACE_ID_COUNT];
 
   DISALLOW_COPY_AND_ASSIGN(InterfaceList);
 };
 
 }  // namespace proxy
 }  // namespace ppapi
 
 #endif  // PPAPI_PROXY_INTERFACE_LIST_H_