Require an explicit ServiceName annotation for interfaces in Java

mojo/public/tools/bindings/generators/java_templates/interface_definition.tmpl

 {% from "constant_definition.tmpl" import constant_def %}
 {% from "enum_definition.tmpl" import enum_def %}
 {% from "data_types_definition.tmpl" import struct_def %}
 
 {%- macro declare_params(parameters, boxed=false) %}
 {%-   for param in parameters -%}
 {{param.kind|java_type(boxed)}} {{param|name}}
 {%- if not loop.last %}, {% endif %}
 {%-   endfor %}
 {%- endmacro %}
@@ skipping 33 matching lines @@
 {%-  if not use_response_flag -%}
 org.chromium.mojo.bindings.MessageHeader.NO_FLAG
 {%-   elif is_request: -%}
 org.chromium.mojo.bindings.MessageHeader.MESSAGE_EXPECTS_RESPONSE_FLAG
 {%-   else -%}
 org.chromium.mojo.bindings.MessageHeader.MESSAGE_IS_RESPONSE_FLAG
 {%-   endif -%}
 {%- endmacro -%}
 
 {%- macro manager_class(interface, fully_qualified=False) -%}
-{% if fully_qualified %}org.chromium.mojo.bindings.Interface.{% endif %}Manager<{{interface|name}}, {{interface|name}}.Proxy>
+{% if fully_qualified %}org.chromium.mojo.bindings.Interface.{% endif %}{% if interface.service_name %}Named{% endif %}Manager<{{interface|name}}, {{interface|name}}.Proxy>
 {%- endmacro -%}
 
 {%- macro manager_def(interface) -%}
 public static final {{manager_class(interface, True)}} MANAGER =
         new {{manager_class(interface, True)}}() {
+{% if interface.service_name %}
 
     public String getName() {
-        return "{{namespace|replace(".","::")}}::{{interface.name}}";
+        return "{{interface.service_name}}";
     }
+{% endif %}
 
     public int getVersion() {
       return {{interface.version}};
     }
 
     public Proxy buildProxy(org.chromium.mojo.system.Core core,
                             org.chromium.mojo.bindings.MessageReceiverWithResponder messageReceiver) {
         return new Proxy(core, messageReceiver);
     }
 
@@ skipping 204 matching lines @@
                                     {{flags_for_method(method, False)}},
                                     mRequestId));
             mMessageReceiver.accept(_message);
         }
     }
 {%   endif %}
 {% endfor %}
 
 }
 {% endmacro %}