Revert 100751 - Fix Windows build by renaming interface to iface.

TEST=it compiles
Review URL: http://codereview.chromium.org/7871005

TBR=brettw@chromium.org
Review URL: http://codereview.chromium.org/7872007

git-svn-id: svn://svn.chromium.org/chrome/trunk/src@100752 0039d316-1c4b-4281-b951-d872f2087c98

2 files changed, 9 insertions, 9 deletions

diff --git a/ppapi/proxy/interface_list.cc b/ppapi/proxy/interface_list.cc
index 0b386aa..b03ba9b 100644
--- a/ppapi/proxy/interface_list.cc
+++ b/ppapi/proxy/interface_list.cc
@@ -241,7 +241,7 @@ const void* InterfaceList::GetInterfaceForPPB(const std::string& name) const {
       name_to_browser_info_.find(name);
   if (found == name_to_browser_info_.end())
     return NULL;
-  return found->second.iface;
+  return found->second.interface;
 }
 
 const void* InterfaceList::GetInterfaceForPPP(const std::string& name) const {
@@ -249,7 +249,7 @@ const void* InterfaceList::GetInterfaceForPPP(const std::string& name) const {
       name_to_plugin_info_.find(name);
   if (found == name_to_plugin_info_.end())
     return NULL;
-  return found->second.iface;
+  return found->second.interface;
 }
 
 void InterfaceList::AddProxy(InterfaceID id,
@@ -270,16 +270,16 @@ void InterfaceList::AddProxy(InterfaceID id,
 
 void InterfaceList::AddPPB(const char* name,
                            InterfaceID id,
-                           const void* iface) {
+                           const void* interface) {
   DCHECK(name_to_browser_info_.find(name) == name_to_browser_info_.end());
-  name_to_browser_info_[name] = InterfaceInfo(id, iface);
+  name_to_browser_info_[name] = InterfaceInfo(id, interface);
 }
 
 void InterfaceList::AddPPP(const char* name,
                            InterfaceID id,
-                           const void* iface) {
+                           const void* interface) {
   DCHECK(name_to_plugin_info_.find(name) == name_to_plugin_info_.end());
-  name_to_plugin_info_[name] = InterfaceInfo(id, iface);
+  name_to_plugin_info_[name] = InterfaceInfo(id, interface);
 }
 
 void InterfaceList::AddPPB(const InterfaceProxy::Info* info) {
diff --git a/ppapi/proxy/interface_list.h b/ppapi/proxy/interface_list.h
index bcbd3b8..7354af5 100644
--- a/ppapi/proxy/interface_list.h
+++ b/ppapi/proxy/interface_list.h
@@ -47,15 +47,15 @@ class InterfaceList {
     }
 
     InterfaceID id;
-    const void* iface;
+    const void* interface;
   };
 
   typedef std::map<std::string, InterfaceInfo> NameToInterfaceInfoMap;
 
   void AddProxy(InterfaceID id, InterfaceProxy::Factory factory);
 
-  void AddPPB(const char* name, InterfaceID id, const void* iface);
-  void AddPPP(const char* name, InterfaceID id, const void* iface);
+  void AddPPB(const char* name, InterfaceID id, const void* interface);
+  void AddPPP(const char* name, InterfaceID id, const void* interface);
 
   // Old-style add functions. These should be removed when the rest of the
   // proxies are converted over to using the new system.