Mojo: Simplify object serialization

mojo/public/bindings/generators/cpp_templates/module.cc.tmpl

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "./{{module_name|camel_to_underscores}}.h"
 
+#include "mojo/public/bindings/lib/bindings_serialization.h"
 #include "mojo/public/bindings/lib/message_builder.h"
 
 namespace {{namespace}} {
 namespace internal {
 namespace {
 
 #pragma pack(push, 1)
 #if defined(__clang__)
 #pragma clang diagnostic push
 #pragma clang diagnostic ignored "-Wunused-private-field"
 #endif
 {#--- Interface parameter definitions #}
 {%- for interface in interfaces %}
 {%-   for method in interface.methods %}
 {%-     set struct = interface|struct_from_method(method) %}
 {%-     include "params_definition.tmpl" %}
 {%-   endfor %}
 {%- endfor %}
 #if defined(__clang__)
 #pragma clang diagnostic pop
 #endif
 #pragma pack(pop)
 
 }  // namespace
 
+{#--- Struct destructors #}
+{%- for struct in structs %}
+{%-   include "struct_destructor.tmpl" %}
+{%- endfor %}
+
 {#--- Struct definitions #}
 {%  for struct in structs %}
 {%-   include "struct_definition.tmpl" %}
 {%- endfor %}
 
-{#--- Struct destructors #}
-{%- for struct in structs %}
-{%-   include "struct_destructor.tmpl" %}
-{%- endfor %}
-
 }  // namespace internal
 
 {#--- Struct builder definitions #}
 {%- for struct in structs %}
 {%-   include "struct_builder_definition.tmpl" %}
 {%- endfor %}
 
 {#--- Interface definitions #}
 {%- for interface in interfaces %}
 {%-   include "interface_definition.tmpl" %}
 {%- endfor %}
 }  // namespace {{namespace}}
-
-namespace mojo {
-namespace internal {
-
-{#--- Struct serialization definitions #}
-{%- for struct in structs %}
-{%-   include "struct_serialization_definition.tmpl" %}
-{%- endfor %}
-
-{#--- Interface serialization definitions #}
-{%- for interface in interfaces %}
-{%-   for method in interface.methods %}
-{%-     set struct = interface|struct_from_method(method) %}
-{%-     include "params_serialization.tmpl" %}
-{%-   endfor %}
-{%- endfor %}
-
-}  // namespace internal
-}  // namespace mojo