Mojo code generator: simplify how imported types and values are handled.

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.
 
 {%- if variant -%}
 {%-   set variant_path = "%s-%s"|format(module.path, variant) -%}
 {%- else -%}
 {%-   set variant_path = module.path -%}
 {%- endif -%}
 
@@ skipping 43 matching lines @@
 #include "mojo/public/cpp/bindings/lib/serialization.h"
 #include "mojo/public/cpp/bindings/native_struct.h"
 #include "mojo/public/cpp/bindings/raw_ptr_impl_ref_traits.h"
 #include "mojo/public/cpp/bindings/struct_ptr.h"
 #include "mojo/public/cpp/bindings/struct_traits.h"
 #include "mojo/public/cpp/bindings/thread_safe_interface_ptr.h"
 #include "mojo/public/cpp/bindings/union_traits.h"
 #include "{{module.path}}-shared.h"
 {%- for import in imports %}
 {%-   if variant %}
-#include "{{"%s-%s.h"|format(import.module.path, variant)}}"
+#include "{{"%s-%s.h"|format(import.path, variant)}}"
 {%-   else %}
-#include "{{import.module.path}}.h"
+#include "{{import.path}}.h"
 {%-   endif %}
 {%- endfor %}
 {%- if not for_blink %}
 #include <string>
 #include <vector>
 {%- else %}
 {# hash_util.h includes template specializations that should be present for
    every use of {Inlined}StructPtr. #}
 #include "mojo/public/cpp/bindings/lib/wtf_hash_util.h"
 #include "third_party/WebKit/Source/platform/wtf/HashFunctions.h"
@@ skipping 149 matching lines @@
 {#--- Union Serialization Helpers -#}
 {%  if unions %}
 {%-   for union in unions %}
 {%      include "union_traits_declaration.tmpl" %}
 {%-   endfor %}
 {%- endif %}
 
 }  // namespace mojo
 
 #endif  // {{header_guard}}