Mojo C++ bindings: remove support for generating code with mojo::Array/String/Map/WTFArray/WTFMap.

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

Index: mojo/public/tools/bindings/generators/cpp_templates/interface_macros.tmpl
diff --git a/mojo/public/tools/bindings/generators/cpp_templates/interface_macros.tmpl b/mojo/public/tools/bindings/generators/cpp_templates/interface_macros.tmpl
index ec466e5000ae560afc25ddef5d1d46d51eb7ed59..8649273633342ba417f784440b025b2745460c68 100644
--- a/mojo/public/tools/bindings/generators/cpp_templates/interface_macros.tmpl
+++ b/mojo/public/tools/bindings/generators/cpp_templates/interface_macros.tmpl
@@ -5,33 +5,21 @@
 {%-   endfor %}
 {%- endmacro %}
 
-{%- macro declare_responder_params(prefix, parameters, for_blink, use_new_wrapper_types) %}
+{%- macro declare_responder_params(prefix, parameters, for_blink) %}
 {%-   for param in parameters -%}
-{%-     if (not param.kind|is_string_kind) or for_blink or
-           use_new_wrapper_types -%}
 {{param.kind|cpp_wrapper_param_type}} {{prefix}}{{param.name}}
-{%-     else %}
-mojo::String {{prefix}}{{param.name}}
-{%-     endif %}
 {%- if not loop.last %}, {% endif %}
 {%-   endfor %}
 {%- endmacro %}
 
-{%- macro declare_callback(method, for_blink, use_new_wrapper_types, use_once_callback) -%}
+{%- macro declare_callback(method, for_blink, use_once_callback) -%}
 {%-   if use_once_callback -%}
 base::OnceCallback<void(
 {%-   else -%}
 base::Callback<void(
 {%-   endif -%}
 {%-   for param in method.response_parameters -%}
-{#- TODO(yzshen): For historical reasons, we use mojo::String here (instead of
-    const mojo::String&) inconsistently. Preserve the behavior temporarily. #}
-{%-     if (not param.kind|is_string_kind) or for_blink or
-           use_new_wrapper_types -%}
 {{param.kind|cpp_wrapper_param_type}}
-{%-     else -%}
-mojo::String
-{%-     endif %}
 {%-     if not loop.last %}, {% endif %}
 {%-   endfor -%}
 )>