Fix shadowed variables in the content layer.

Shadowed variables can make code harder to read. Don't support them
in the content layer.

BUG=794619

This CL was uploaded by git cl split.

Change-Id: I89b52d89edbaff91c681700fa58bd591757abc28
Reviewed-on: https://chromium-review.googlesource.com/923346Reviewed-by: Ken Rockot <rockot@chromium.org>
Commit-Queue: Dave Tapuska <dtapuska@chromium.org>
Cr-Commit-Position: refs/heads/master@{#537854}

mojo/public/tools/bindings/generators/cpp_templates/wrapper_class_template_definition.tmpl

@@ -11,9 +11,9 @@ template <typename StructPtrType>
 template <typename T,
           typename std::enable_if<std::is_same<
               T, {{struct.name}}>::value>::type*>
-bool {{struct.name}}::Equals(const T& other) const {
+bool {{struct.name}}::Equals(const T& other_struct) const {
 {%- for field in struct.fields %}
-  if (!mojo::Equals(this->{{field.name}}, other.{{field.name}}))
+  if (!mojo::Equals(this->{{field.name}}, other_struct.{{field.name}}))
     return false;
 {%- endfor %}
   return true;