[mojo] Add typemap and variant support to generators

mojo/public/tools/bindings/generators/cpp_templates/module.h.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.
 
-{%- set header_guard = "%s_H_"|
-        format(module.path|upper|replace("/","_")|replace(".","_")) %}
+{%- if variant -%}
+{%-   set variant_path = "%s-%s"|format(module.path, variant) -%}
+{%- else -%}
+{%-   set variant_path = module.path -%}
+{%- endif -%}
+
+{%- set header_guard = "%s_H_"|format(
+        variant_path|upper|replace("/","_")|replace(".","_")|
+            replace("-", "_")) %}
 
 #ifndef {{header_guard}}
 #define {{header_guard}}
 
 #include <stdint.h>
 
 #include "mojo/public/cpp/bindings/array.h"
 #include "mojo/public/cpp/bindings/associated_interface_ptr.h"
 #include "mojo/public/cpp/bindings/associated_interface_ptr_info.h"
 #include "mojo/public/cpp/bindings/associated_interface_request.h"
 #include "mojo/public/cpp/bindings/callback.h"
 #include "mojo/public/cpp/bindings/interface_ptr.h"
 #include "mojo/public/cpp/bindings/interface_request.h"
 #include "mojo/public/cpp/bindings/lib/control_message_handler.h"
 #include "mojo/public/cpp/bindings/lib/control_message_proxy.h"
 #include "mojo/public/cpp/bindings/map.h"
 #include "mojo/public/cpp/bindings/message_filter.h"
 #include "mojo/public/cpp/bindings/no_interface.h"
 #include "mojo/public/cpp/bindings/string.h"
 #include "mojo/public/cpp/bindings/struct_ptr.h"
-#include "{{module.path}}-internal.h"
+#include "{{variant_path}}-internal.h"
 {%- for import in imports %}
 #include "{{import.module.path}}.h"
 {%- endfor %}
 
 {%- for namespace in namespaces_as_array %}
 namespace {{namespace}} {
 {%- endfor %}
+{%- if variant %}
+namespace {{variant}} {
+{%- endif %}
 
 {#--- Enums #}
 {% from "enum_macros.tmpl" import enum_decl -%}
 {%  for enum in enums %}
   {{enum_decl(enum)}}
 {%- endfor %}
 
 {#--- Constants #}
 {%- for constant in module.constants %}
 {#-   To be consistent with constants defined inside interfaces, only make
@@ skipping 87 matching lines @@
 {%-   endfor %}
 {%- endif %}
 
 {#--- Union Serialization Helpers -#}
 {%  if unions %}
 {%    for union in unions %}
 {%      include "union_serialization_declaration.tmpl" %}
 {%-   endfor %}
 {%- endif %}
 
+{%- if variant %}
+}  // namespace {{variant}}
+{%- endif %}
 {%- for namespace in namespaces_as_array|reverse %}
 }  // namespace {{namespace}}
 {%- endfor %}
 
 #endif  // {{header_guard}}