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

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

 #!/usr/bin/env python
 # 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.
 #
 # This module is responsible for translating a MojomFileGraph (see
 # mojom_files.mojom) to one or more module.Module.
 #
 # This module takes the output of the mojom parser, a MojomFileGraph  and
 # translates it to the input of the code generators, a module.Module object.
@@ skipping 375 matching lines @@
 
     Args:
       interface: {module.Interface} to be populated.
       mojom_type: {UserDefinedType} referring to the MojomInterface to be
         translated.
     """
     assert (mojom_type.tag
         == mojom_types_mojom.UserDefinedType.Tags.interface_type)
     mojom_interface = mojom_type.interface_type
     interface.attributes = self.AttributesFromMojom(mojom_interface)
-    interface.service_name = None
+    self.PopulateModuleOrImportedFrom(interface, mojom_interface)
+    interface.name = mojom_interface.decl_data.short_name
+    interface.spec = interface.name
+    interface.service_name = mojom_interface.service_name
     if interface.attributes:
-      interface.service_name = interface.attributes.get('ServiceName')
-    self.PopulateModuleOrImportedFrom(interface, mojom_interface)
-    interface.name = mojom_interface.interface_name
-    interface.spec = interface.name
+      assert interface.service_name == interface.attributes.get(
+          'ServiceName', None), interface.service_name
+    else:
+      assert interface.service_name is None, interface.service_name
+
 
     # Translate the dictionary of methods into a list of module.Methods.
     # In order to have a deterministic ordering we sort by method ordinal.
     # TODO(rudominer) Consider ordering by declaration order instead once
     # this field is populated by the front-end.
     interface.methods = [self.MethodFromMojom(mojom_method, interface)
         for ordinal, mojom_method in sorted(mojom_interface.methods.iteritems(),
           key=operator.itemgetter(0))]
     self.PopulateContainedDeclarationsFromMojom(
         interface, mojom_interface.decl_data.contained_declarations)
@@ skipping 388 matching lines @@
 
   Args:
     graph: {mojom_types_mojom.MojomFileGraph} to be translated.
 
   Return:
     {dict<str, module.Module>} mapping the file's name to its module.Module
     translation for all files in graph.files.
   """
   return {file_name: FileTranslator(graph, file_name).Translate()
       for file_name in graph.files}