Fix a bug with mojom imports where 2 imports with the same namespace would

mojo/public/bindings/generators/mojom_cpp_generator.py

 # 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.
 
 """Generates C++ source files from a mojom.Module."""
 
 from generate import mojom
 from generate import mojom_pack
 from generate import mojom_generator
 
@@ skipping 115 matching lines @@
     "is_string_kind": mojom_generator.IsStringKind,
     "is_array_kind": lambda kind: isinstance(kind, mojom.Array),
     "is_struct_with_handles": IsStructWithHandles,
     "struct_size": lambda ps: ps.GetTotalSize() + _HEADER_SIZE,
     "struct_from_method": mojom_generator.GetStructFromMethod,
     "stylize_method": mojom_generator.StudlyCapsToCamel,
     "substitute_namespace": SubstituteNamespace,
     "verify_token_type": mojom_generator.VerifyTokenType,
   }
 
-  @UseJinja("cpp_templates/module.h.tmpl", filters=cpp_filters)
-  def GenerateModuleHeader(self):
+  def GetJinjaExports(self):
     return {
       "module_name": self.module.name,
       "namespace": self.module.namespace,
       "imports": self.module.imports,
       "kinds": self.module.kinds,
       "enums": self.module.enums,
       "structs": self.GetStructs(),
       "interfaces": self.module.interfaces,
       "include_prefix": self.GetIncludePrefix(),
     }
 
+  @UseJinja("cpp_templates/module.h.tmpl", filters=cpp_filters)
+  def GenerateModuleHeader(self):
+    return self.GetJinjaExports()
+
   @UseJinja("cpp_templates/module_internal.h.tmpl", filters=cpp_filters)
   def GenerateModuleInternalHeader(self):
-    return {
-      "module_name": self.module.name,
-      "namespace": self.module.namespace,
-      "imports": self.module.imports,
-      "kinds": self.module.kinds,
-      "enums": self.module.enums,
-      "structs": self.GetStructs(),
-      "interfaces": self.module.interfaces,
-      "include_prefix": self.GetIncludePrefix(),
-    }
+    return self.GetJinjaExports()
 
   @UseJinja("cpp_templates/module.cc.tmpl", filters=cpp_filters)
   def GenerateModuleSource(self):
-    return {
-      "module_name": self.module.name,
-      "namespace": self.module.namespace,
-      "imports": self.module.imports,
-      "kinds": self.module.kinds,
-      "enums": self.module.enums,
-      "structs": self.GetStructs(),
-      "interfaces": self.module.interfaces,
-      "include_prefix": self.GetIncludePrefix(),
-    }
+    return self.GetJinjaExports()
 
   def GenerateFiles(self):
     self.Write(self.GenerateModuleHeader(), "%s.h" % self.module.name)
     self.Write(self.GenerateModuleInternalHeader(),
         "%s_internal.h" % self.module.name)
     self.Write(self.GenerateModuleSource(), "%s.cc" % self.module.name)
 
   def GetIncludePrefix(self):
     if not self.header_dir:
       return ""
     if self.header_dir[-1] == "/":
       return self.header_dir
     return self.header_dir + "/"