6 files changed, 15 insertions, 12 deletions
diff --git a/ppapi/proxy/host_dispatcher.cc b/ppapi/proxy/host_dispatcher.cc
index 858b17b..c5bf08f 100644
--- a/ppapi/proxy/host_dispatcher.cc
+++ b/ppapi/proxy/host_dispatcher.cc
@@ -198,25 +198,27 @@ void HostDispatcher::OnChannelError() {
   ppb_proxy_->PluginCrashed(pp_module());
 }
 
-const void* HostDispatcher::GetProxiedInterface(const std::string& interface) {
+const void* HostDispatcher::GetProxiedInterface(
+    const std::string& proxied_interface) {
   // First see if we even have a proxy for this interface.
-  const InterfaceProxy::Info* info = GetPPPInterfaceInfo(interface);
+  const InterfaceProxy::Info* info = GetPPPInterfaceInfo(proxied_interface);
   if (!info)
     return NULL;
 
-  PluginIFSupportedMap::iterator iter(plugin_if_supported_.find(interface));
+  PluginIFSupportedMap::iterator iter(plugin_if_supported_.find(
+      proxied_interface));
   if (iter == plugin_if_supported_.end()) {
     // Need to query. Cache the result so we only do this once.
     bool supported = false;
 
     bool previous_reentrancy_value = allow_plugin_reentrancy_;
     allow_plugin_reentrancy_ = true;
-    Send(new PpapiMsg_SupportsInterface(interface, &supported));
+    Send(new PpapiMsg_SupportsInterface(proxied_interface, &supported));
     allow_plugin_reentrancy_ = previous_reentrancy_value;
 
     std::pair<PluginIFSupportedMap::iterator, bool> iter_success_pair;
     iter_success_pair = plugin_if_supported_.insert(
-        PluginIFSupportedMap::value_type(interface, supported));
+        PluginIFSupportedMap::value_type(proxied_interface, supported));
     iter = iter_success_pair.first;
   }
   if (iter->second)
diff --git a/ppapi/proxy/host_dispatcher.h b/ppapi/proxy/host_dispatcher.h
index 57ba120..623aa26 100644
--- a/ppapi/proxy/host_dispatcher.h
+++ b/ppapi/proxy/host_dispatcher.h
@@ -80,7 +80,7 @@ class PPAPI_PROXY_EXPORT HostDispatcher : public Dispatcher {
   // if the plugin supports the given interface (with caching) and returns the
   // pointer to the proxied interface if it is supported. Returns NULL if the
   // given interface isn't supported by the plugin or the proxy.
-  const void* GetProxiedInterface(const std::string& interface);
+  const void* GetProxiedInterface(const std::string& proxied_interface);
 
   // Returns the proxy object associated with the given interface ID, creating
   // it if necessary. This is used in cases where a proxy needs to access code
diff --git a/ppapi/proxy/plugin_dispatcher.cc b/ppapi/proxy/plugin_dispatcher.cc
index 58a1017..6aa6653 100644
--- a/ppapi/proxy/plugin_dispatcher.cc
+++ b/ppapi/proxy/plugin_dispatcher.cc
@@ -80,9 +80,9 @@ PluginDispatcher* PluginDispatcher::GetForResource(const Resource* resource) {
 
 // static
 const void* PluginDispatcher::GetInterfaceFromDispatcher(
-    const char* interface) {
+    const char* dispatcher_interface) {
   // All interfaces the plugin requests of the browser are "PPB".
-  const InterfaceProxy::Info* info = GetPPBInterfaceInfo(interface);
+  const InterfaceProxy::Info* info = GetPPBInterfaceInfo(dispatcher_interface);
   if (!info)
     return NULL;
   return info->interface_ptr;
diff --git a/ppapi/proxy/plugin_dispatcher.h b/ppapi/proxy/plugin_dispatcher.h
index 896689e..6634c52 100644
--- a/ppapi/proxy/plugin_dispatcher.h
+++ b/ppapi/proxy/plugin_dispatcher.h
@@ -88,7 +88,8 @@ class PPAPI_PROXY_EXPORT PluginDispatcher : public Dispatcher {
   // object as a convenience. Returns NULL on failure.
   static PluginDispatcher* GetForResource(const Resource* resource);
 
-  static const void* GetInterfaceFromDispatcher(const char* interface);
+  static const void* GetInterfaceFromDispatcher(
+      const char* dispatcher_interface);
 
   // You must call this function before anything else. Returns true on success.
   // The delegate pointer must outlive this class, ownership is not
diff --git a/ppapi/proxy/ppapi_proxy_test.cc b/ppapi/proxy/ppapi_proxy_test.cc
index 89ffa9f..76034d7 100644
--- a/ppapi/proxy/ppapi_proxy_test.cc
+++ b/ppapi/proxy/ppapi_proxy_test.cc
@@ -105,8 +105,8 @@ const void* ProxyTestHarnessBase::GetInterface(const char* name) {
 }
 
 void ProxyTestHarnessBase::RegisterTestInterface(const char* name,
-                                                 const void* interface) {
-  registered_interfaces_[name] = interface;
+                                                 const void* test_interface) {
+  registered_interfaces_[name] = test_interface;
 }
 
 bool ProxyTestHarnessBase::SupportsInterface(const char* name) {
diff --git a/ppapi/proxy/ppapi_proxy_test.h b/ppapi/proxy/ppapi_proxy_test.h
index 0d3d506..03ec57d 100644
--- a/ppapi/proxy/ppapi_proxy_test.h
+++ b/ppapi/proxy/ppapi_proxy_test.h
@@ -53,7 +53,7 @@ class ProxyTestHarnessBase {
   // Allows the test to specify an interface implementation for a given
   // interface name. This will be returned when any of the proxy logic
   // requests a local interface.
-  void RegisterTestInterface(const char* name, const void* interface);
+  void RegisterTestInterface(const char* name, const void* test_interface);
 
   // Sends a "supports interface" message to the current dispatcher and returns
   // true if it's supported. This is just for the convenience of tests.