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

mojo/public/bindings/generators/mojom_cpp_generator.py

Index: mojo/public/bindings/generators/mojom_cpp_generator.py
diff --git a/mojo/public/bindings/generators/mojom_cpp_generator.py b/mojo/public/bindings/generators/mojom_cpp_generator.py
index 2b7c3d5f8f0db40620993cf97ac4b10f02057ec4..4b004e225f0887da75585a54a98d36df00d0f495 100644
--- a/mojo/public/bindings/generators/mojom_cpp_generator.py
+++ b/mojo/public/bindings/generators/mojom_cpp_generator.py
@@ -133,8 +133,7 @@ class Generator(mojom_generator.Generator):
     "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,
@@ -146,31 +145,17 @@ class Generator(mojom_generator.Generator):
       "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)