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

ppapi/proxy/interface_list.cc

 // 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.
 
 #include "ppapi/proxy/interface_list.h"
 
 #include "base/memory/singleton.h"
 #include "ppapi/c/dev/ppb_buffer_dev.h"
 #include "ppapi/c/dev/ppb_char_set_dev.h"
 #include "ppapi/c/dev/ppb_console_dev.h"
@@ skipping 223 matching lines @@
   if (id <= 0 || id >= INTERFACE_ID_COUNT)
     return NULL;
   return id_to_factory_[index];
 }
 
 const void* InterfaceList::GetInterfaceForPPB(const std::string& name) const {
   NameToInterfaceInfoMap::const_iterator found =
       name_to_browser_info_.find(name);
   if (found == name_to_browser_info_.end())
     return NULL;
-  return found->second.interface;
+  return found->second.iface;
 }
 
 const void* InterfaceList::GetInterfaceForPPP(const std::string& name) const {
   NameToInterfaceInfoMap::const_iterator found =
       name_to_plugin_info_.find(name);
   if (found == name_to_plugin_info_.end())
     return NULL;
-  return found->second.interface;
+  return found->second.iface;
 }
 
 void InterfaceList::AddProxy(InterfaceID id,
                              InterfaceProxy::Factory factory) {
   // For interfaces with no corresponding _Proxy objects, the macros will
   // generate calls to this function with INTERFACE_ID_NONE. This means we
   // should just skip adding a factory for these functions.
   if (id == INTERFACE_ID_NONE)
     return;
 
   // The factory should be an exact dupe of the one we already have if it
   // has already been registered before.
   int index = static_cast<int>(id);
   DCHECK(!id_to_factory_[index] || id_to_factory_[index] == factory);
 
   id_to_factory_[index] = factory;
 }
 
 void InterfaceList::AddPPB(const char* name,
                            InterfaceID id,
-                           const void* interface) {
+                           const void* iface) {
   DCHECK(name_to_browser_info_.find(name) == name_to_browser_info_.end());
-  name_to_browser_info_[name] = InterfaceInfo(id, interface);
+  name_to_browser_info_[name] = InterfaceInfo(id, iface);
 }
 
 void InterfaceList::AddPPP(const char* name,
                            InterfaceID id,
-                           const void* interface) {
+                           const void* iface) {
   DCHECK(name_to_plugin_info_.find(name) == name_to_plugin_info_.end());
-  name_to_plugin_info_[name] = InterfaceInfo(id, interface);
+  name_to_plugin_info_[name] = InterfaceInfo(id, iface);
 }
 
 void InterfaceList::AddPPB(const InterfaceProxy::Info* info) {
   AddProxy(info->id, info->create_proxy);
   AddPPB(info->name, info->id, info->interface_ptr);
 }
 
 void InterfaceList::AddPPP(const InterfaceProxy::Info* info) {
   AddProxy(info->id, info->create_proxy);
   AddPPP(info->name, info->id, info->interface_ptr);
 }
 
 }  // namespace proxy
 }  // namespace ppapi