mojo: java bindings rename Message subclasses.

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 "struct_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 75 matching lines @@
         return {{client|java_type}}.MANAGER;
     }
 {%  endif %}
 };
 {%- endmacro -%}
 
 {%- macro accept_body(interface, with_response) -%}
 {% if (interface|has_method_with_response and with_response) or
       (interface|has_method_without_response and not with_response) %}
 try {
-    org.chromium.mojo.bindings.MessageWithHeader messageWithHeader =
-            message.asMojoMessage();
+    org.chromium.mojo.bindings.ServiceMessage messageWithHeader =
+            message.asServiceMessage();
     org.chromium.mojo.bindings.MessageHeader header = messageWithHeader.getHeader();
     if (!header.validateHeader({{flags(with_response, True)}})) {
         return false;
     }
     switch(header.getType()) {
 {%   for method in interface.methods %}
 {%     if (with_response and method.response_parameters) or
         (not with_response and not method.response_parameters) %}
 {%       set request_struct = method|struct_from_method %}
 {%       if with_response %}
@@ skipping 119 matching lines @@
             implements org.chromium.mojo.bindings.MessageReceiver {
         private final {{interface|name}}.{{method|interface_response_name}} mCallback;
 
         {{response_struct|name}}ForwardToCallback({{interface|name}}.{{method|interface_response_name}} callback) {
             this.mCallback = callback;
         }
 
         @Override
         public boolean accept(org.chromium.mojo.bindings.Message message) {
             try {
-                org.chromium.mojo.bindings.MessageWithHeader messageWithHeader =
-                        message.asMojoMessage();
+                org.chromium.mojo.bindings.ServiceMessage messageWithHeader =
+                        message.asServiceMessage();
                 org.chromium.mojo.bindings.MessageHeader header = messageWithHeader.getHeader();
                 if (!header.validateHeader({{method|method_ordinal_name}},
                                            {{flags_for_method(method, False)}})) {
                     return false;
                 }
                 {{response_struct|name}} response = {{response_struct|name}}.deserialize(messageWithHeader.getPayload());
                 mCallback.call({{run_callback('response', method.response_parameters)}});
                 return true;
             } catch (org.chromium.mojo.bindings.DeserializationException e) {
                 return false;
@@ skipping 15 matching lines @@
             mMessageReceiver = messageReceiver;
             mRequestId = requestId;
         }
 
         @Override
         public void call({{declare_params(method.response_parameters, true)}}) {
             {{response_struct|name}} response = new {{response_struct|name}}();
 {%   for param in method.response_parameters %}
             response.{{param|name}} = {{param|name}};
 {%   endfor %}
-            org.chromium.mojo.bindings.MessageWithHeader message =
+            org.chromium.mojo.bindings.ServiceMessage message =
                     response.serializeWithHeader(
                             mCore,
                             new org.chromium.mojo.bindings.MessageHeader(
                                     {{method|method_ordinal_name}},
                                     {{flags_for_method(method, False)}},
                                     mRequestId));
             mMessageReceiver.accept(message);
         }
     }
 {%   endif %}
 {% endfor %}
 
 }
 {% endmacro %}