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

mojo/public/tools/bindings/generators/cpp_templates/module-shared.h.tmpl

 // Copyright 2016 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_SHARED_H_"|format(
         module.path|upper|replace("/","_")|replace(".","_")|
             replace("-", "_")) %}
 
 {%- macro mojom_type_traits(kind) %}
 template <>
@@ skipping 36 matching lines @@
 #include "mojo/public/cpp/bindings/enum_traits.h"
 #include "mojo/public/cpp/bindings/interface_data_view.h"
 #include "mojo/public/cpp/bindings/lib/bindings_internal.h"
 #include "mojo/public/cpp/bindings/lib/serialization.h"
 #include "mojo/public/cpp/bindings/map_data_view.h"
 #include "mojo/public/cpp/bindings/native_enum.h"
 #include "mojo/public/cpp/bindings/native_struct_data_view.h"
 #include "mojo/public/cpp/bindings/string_data_view.h"
 #include "{{module.path}}-shared-internal.h"
 {%- for import in imports %}
-#include "{{import.module.path}}-shared.h"
+#include "{{import.path}}-shared.h"
 {%- endfor %}
 
 {{namespace_begin()}}
 
 {#--- Struct Forward Declarations -#}
 {%- for struct in structs %}
 {%-   if struct|is_native_only_kind %}
 using {{struct.name}}DataView = mojo::NativeStructDataView;
 {%-   else %}
 class {{struct.name}}DataView;
@@ skipping 135 matching lines @@
 {%- endfor %}
 
 {%- for union in unions %}
 {%    include "union_data_view_definition.tmpl" %}
 {%- endfor %}
 
 {{namespace_end()}}
 
 #endif  // {{header_guard}}