mojom_types.mojom: Changes the name |interface_name| to |service_name| in struct MojomInterface.

mojo/public/tools/bindings/pylib/mojom/generate/mojom_translator_unittest.py

 # Copyright 2015 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.
 
 import unittest
 import module
 
 try:
   import mojom_translator
   from generated import mojom_files_mojom
@@ skipping 55 matching lines @@
         module_namespace='somens')
     graph.files = {
         file_name: mojom_file,
         imported_file_name: imported_file,
         second_level_imported_file_name: second_level_imported_file
         }
 
     mojom_interface = mojom_types_mojom.MojomInterface(
         methods={},
         decl_data=mojom_types_mojom.DeclarationData(
+          short_name='AnInterface',
           source_file_info=mojom_types_mojom.SourceFileInfo(
-            file_name=file_name)),
-        interface_name='AnInterface')
+            file_name=file_name)))
     graph.resolved_types['interface_key'] = mojom_types_mojom.UserDefinedType(
         interface_type=mojom_interface)
 
     mojom_struct = mojom_types_mojom.MojomStruct(
         fields=[],
         decl_data=mojom_types_mojom.DeclarationData(
           short_name='AStruct',
           full_identifier='foo.AStruct',
           source_file_info=mojom_types_mojom.SourceFileInfo(
             file_name=file_name)))
@@ skipping 49 matching lines @@
     self.assertEquals(imported_file.module_namespace,
         mod.imports[0]['namespace'])
     self.assertEquals(imported_file.file_name, mod.imports[0]['module'].path)
 
     self.assertEquals(2, len(mod.transitive_imports))
     transitive_imports_paths = [imp['module'].path
         for imp in mod.transitive_imports]
     self.assertIn(imported_file_name, transitive_imports_paths)
     self.assertIn(second_level_imported_file_name, transitive_imports_paths)
 
-    self.assertEquals(mojom_interface.interface_name, mod.interfaces[0].name)
+    self.assertEquals('AnInterface', mod.interfaces[0].name)
     # Interfaces should be assigned their name as their spec.
     self.assertEquals('AnInterface', mod.interfaces[0].spec)
     self.assertEquals(mojom_struct.decl_data.short_name, mod.structs[0].name)
     # The struct was given a full_identifier so its spec should be that.
     self.assertEquals(mojom_struct.decl_data.full_identifier,
         mod.structs[0].spec)
     self.assertEquals(mojom_union.decl_data.short_name, mod.unions[0].name)
     # The union was given a short name but not a full_identifier so its spec
     # should be the short name.
     self.assertEquals(mojom_union.decl_data.short_name,
@@ skipping 21 matching lines @@
     self.assertEquals([], mod.imports)
 
 @unittest.skipUnless(bindings_imported, 'Could not import python bindings.')
 class TestUserDefinedFromTypeRef(unittest.TestCase):
 
   def do_interface_test(self, nullable, interface_request):
     # Build a MojomInterface
     file_name = 'a.mojom'
     mojom_interface = mojom_types_mojom.MojomInterface(
         decl_data=mojom_types_mojom.DeclarationData(
+          short_name='AnInterface',
           source_file_info=mojom_types_mojom.SourceFileInfo(
-            file_name=file_name)),
-        interface_name='AnInterface')
+            file_name=file_name)))
     mojom_interface.methods={}
 
     # Register the MojomInterface in a MojomFileGraph
     graph = mojom_files_mojom.MojomFileGraph()
     type_key = 'some_type_key'
     graph.resolved_types = {
       type_key: mojom_types_mojom.UserDefinedType(
         interface_type=mojom_interface)}
 
     # Build a reference to the interface.
@@ skipping 296 matching lines @@
         mojom_types_mojom.Type(
           type_reference=mojom_types_mojom.TypeReference(
             type_key=type_key)))
 
     self.assertEquals(
         translator._transitive_imports['root/c.mojom']['module'], struct.module)
     self.assertEquals(
         translator._transitive_imports['root/c.mojom'], struct.imported_from)
 
   def test_interface(self):
+    self.do_interface_test(True)
+    self.do_interface_test(False)
+
+  def do_interface_test(self, specify_service_name):
     file_name = 'a.mojom'
     mojom_interface = mojom_types_mojom.MojomInterface(
         decl_data=mojom_types_mojom.DeclarationData(
+          short_name='AnInterface',
           source_file_info=mojom_types_mojom.SourceFileInfo(
-            file_name=file_name)),
-        interface_name='AnInterface')
+            file_name=file_name)))
+    if specify_service_name:
+      mojom_interface.service_name = 'test::TheInterface'
+      mojom_interface.decl_data.attributes = [mojom_types_mojom.Attribute(
+          key='ServiceName', value=mojom_types_mojom.LiteralValue(
+              string_value='test::TheInterface'))]
+    else:
+      mojom_interface.service_name = None
     mojom_method10 = mojom_types_mojom.MojomMethod(
         ordinal=10,
         decl_data=mojom_types_mojom.DeclarationData(
           short_name='AMethod10',
           source_file_info=mojom_types_mojom.SourceFileInfo(
             file_name=file_name)),
         parameters=mojom_types_mojom.MojomStruct(fields=[]))
     mojom_method0 = mojom_types_mojom.MojomMethod(
         ordinal=0,
         decl_data=mojom_types_mojom.DeclarationData(
@@ skipping 11 matching lines @@
     mojom_interface.methods = {10: mojom_method10, 0: mojom_method0,
         7: mojom_method7}
 
     interface = module.Interface()
     graph = mojom_files_mojom.MojomFileGraph()
     translator = mojom_translator.FileTranslator(graph, file_name)
     translator.InterfaceFromMojom(interface, mojom_types_mojom.UserDefinedType(
       interface_type=mojom_interface))
 
     self.assertEquals(translator._module, interface.module)
-    self.assertEquals(mojom_interface.interface_name, interface.name)
+    self.assertEquals('AnInterface', interface.name)
     self.assertEquals(0, interface.methods[0].ordinal)
     self.assertEquals(7, interface.methods[1].ordinal)
     self.assertEquals(10, interface.methods[2].ordinal)
+    if specify_service_name:
+      self.assertEquals('test::TheInterface', interface.service_name)
+    else:
+      self.assertEquals(None, interface.service_name)
+
     # TODO(azani): Add the contained declarations.
 
   def test_method(self):
     file_name = 'a.mojom'
     mojom_method = mojom_types_mojom.MojomMethod(
         ordinal=10,
         decl_data=mojom_types_mojom.DeclarationData(
           short_name='AMethod',
           source_file_info=mojom_types_mojom.SourceFileInfo(
             file_name=file_name)))
@@ skipping 371 matching lines @@
     result2 = t.KindFromMojom(mojom_type)
     self.assertIs(result, result2)
 
     # Nullable type reference
     mojom_type.type_reference.nullable = True
     nullable_result = t.KindFromMojom(mojom_type)
     self.assertTrue(module.IsNullableKind(nullable_result))
 
 if __name__ == '__main__':
   unittest.main()