| Index: mojo/public/tools/bindings/mojom.gni | 
| diff --git a/mojo/public/tools/bindings/mojom.gni b/mojo/public/tools/bindings/mojom.gni | 
| index d0c6281b477a2200cdcf032aa5b22a18c903a204..308a878a1c72e4fc88cdc7626def07512f368c91 100644 | 
| --- a/mojo/public/tools/bindings/mojom.gni | 
| +++ b/mojo/public/tools/bindings/mojom.gni | 
| @@ -12,7 +12,6 @@ template("mojom") { | 
| generator_sources = [ | 
| generator_script, | 
| "$generator_root/generators/cpp_templates/enum_declaration.tmpl", | 
| -    "$generator_root/generators/cpp_templates/enum_traits.tmpl", | 
| "$generator_root/generators/cpp_templates/interface_declaration.tmpl", | 
| "$generator_root/generators/cpp_templates/interface_definition.tmpl", | 
| "$generator_root/generators/cpp_templates/interface_macros.tmpl", | 
| @@ -24,12 +23,13 @@ template("mojom") { | 
| "$generator_root/generators/cpp_templates/module.h.tmpl", | 
| "$generator_root/generators/cpp_templates/module-internal.h.tmpl", | 
| "$generator_root/generators/cpp_templates/params_definition.tmpl", | 
| -    "$generator_root/generators/cpp_templates/struct_builder_definition.tmpl", | 
| "$generator_root/generators/cpp_templates/struct_declaration.tmpl", | 
| "$generator_root/generators/cpp_templates/struct_definition.tmpl", | 
| -    "$generator_root/generators/cpp_templates/struct_destructor.tmpl", | 
| +    "$generator_root/generators/cpp_templates/struct_serialization_declaration.tmpl", | 
| +    "$generator_root/generators/cpp_templates/struct_serialization_definition.tmpl", | 
| "$generator_root/generators/cpp_templates/struct_macros.tmpl", | 
| "$generator_root/generators/cpp_templates/wrapper_class_declaration.tmpl", | 
| +    "$generator_root/generators/cpp_templates/wrapper_class_definition.tmpl", | 
| "$generator_root/generators/js_templates/enum_definition.tmpl", | 
| "$generator_root/generators/js_templates/interface_definition.tmpl", | 
| "$generator_root/generators/js_templates/module.js.tmpl", | 
|  |