| Index: mojo/dart/packages/mojo_services/lib/http_server/http_server.mojom.dart
 | 
| diff --git a/mojo/dart/packages/mojo_services/lib/http_server/http_server.mojom.dart b/mojo/dart/packages/mojo_services/lib/http_server/http_server.mojom.dart
 | 
| index 4b0d87adbb021bcdec780daf8dfc32a803b4b85d..8c9339b705917fb04343ff92fc738afcfa33debf 100644
 | 
| --- a/mojo/dart/packages/mojo_services/lib/http_server/http_server.mojom.dart
 | 
| +++ b/mojo/dart/packages/mojo_services/lib/http_server/http_server.mojom.dart
 | 
| @@ -8,6 +8,8 @@ import 'dart:async';
 | 
|  
 | 
|  import 'package:mojo/bindings.dart' as bindings;
 | 
|  import 'package:mojo/core.dart' as core;
 | 
| +import 'package:mojo/mojo/mojom_types.mojom.dart' as mojom_types;
 | 
| +import 'package:mojo/mojo/service_describer.mojom.dart' as service_describer;
 | 
|  import 'package:mojo_services/http_server/http_request.mojom.dart' as http_request_mojom;
 | 
|  import 'package:mojo_services/http_server/http_response.mojom.dart' as http_response_mojom;
 | 
|  
 | 
| @@ -86,6 +88,26 @@ class HttpServerSetHandlerParams extends bindings.Struct {
 | 
|    }
 | 
|  }
 | 
|  
 | 
| +mojom_types.MojomStruct _http_server_HttpServer_SetHandler_Params__() {
 | 
| +  return new mojom_types.MojomStruct()
 | 
| +    ..declData = (new mojom_types.DeclarationData()..shortName = 'HttpServerSetHandlerParams')
 | 
| +    ..fields = <mojom_types.StructField>[
 | 
| +      new mojom_types.StructField()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = 'Pattern')
 | 
| +        ..type = (new mojom_types.Type()
 | 
| +..stringType = (new mojom_types.StringType()..nullable = false)),
 | 
| +      
 | 
| +      new mojom_types.StructField()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = 'Handler')
 | 
| +        ..type = (new mojom_types.Type()
 | 
| +    ..typeReference = (new mojom_types.TypeReference()
 | 
| +  
 | 
| +    ..identifier = '_http_server_HttpHandler__'
 | 
| +    ..typeKey = '_http_server_HttpHandler__'
 | 
| +  )),
 | 
| +      ];
 | 
| +}
 | 
| +
 | 
|  
 | 
|  class HttpServerSetHandlerResponseParams extends bindings.Struct {
 | 
|    static const List<bindings.StructDataHeader> kVersions = const [
 | 
| @@ -153,6 +175,16 @@ class HttpServerSetHandlerResponseParams extends bindings.Struct {
 | 
|    }
 | 
|  }
 | 
|  
 | 
| +mojom_types.MojomStruct _http_server_HttpServer_SetHandler_ResponseParams__() {
 | 
| +  return new mojom_types.MojomStruct()
 | 
| +    ..declData = (new mojom_types.DeclarationData()..shortName = 'HttpServerSetHandlerResponseParams')
 | 
| +    ..fields = <mojom_types.StructField>[
 | 
| +      new mojom_types.StructField()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = 'Success')
 | 
| +        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.BOOL),
 | 
| +      ];
 | 
| +}
 | 
| +
 | 
|  
 | 
|  class HttpServerGetPortParams extends bindings.Struct {
 | 
|    static const List<bindings.StructDataHeader> kVersions = const [
 | 
| @@ -211,6 +243,12 @@ class HttpServerGetPortParams extends bindings.Struct {
 | 
|    }
 | 
|  }
 | 
|  
 | 
| +mojom_types.MojomStruct _http_server_HttpServer_GetPort_Params__() {
 | 
| +  return new mojom_types.MojomStruct()
 | 
| +    ..declData = (new mojom_types.DeclarationData()..shortName = 'HttpServerGetPortParams')
 | 
| +    ..fields = <mojom_types.StructField>[];
 | 
| +}
 | 
| +
 | 
|  
 | 
|  class HttpServerGetPortResponseParams extends bindings.Struct {
 | 
|    static const List<bindings.StructDataHeader> kVersions = const [
 | 
| @@ -278,6 +316,16 @@ class HttpServerGetPortResponseParams extends bindings.Struct {
 | 
|    }
 | 
|  }
 | 
|  
 | 
| +mojom_types.MojomStruct _http_server_HttpServer_GetPort_ResponseParams__() {
 | 
| +  return new mojom_types.MojomStruct()
 | 
| +    ..declData = (new mojom_types.DeclarationData()..shortName = 'HttpServerGetPortResponseParams')
 | 
| +    ..fields = <mojom_types.StructField>[
 | 
| +      new mojom_types.StructField()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = 'Port')
 | 
| +        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.UINT16),
 | 
| +      ];
 | 
| +}
 | 
| +
 | 
|  
 | 
|  class HttpHandlerHandleRequestParams extends bindings.Struct {
 | 
|    static const List<bindings.StructDataHeader> kVersions = const [
 | 
| @@ -345,6 +393,21 @@ class HttpHandlerHandleRequestParams extends bindings.Struct {
 | 
|    }
 | 
|  }
 | 
|  
 | 
| +mojom_types.MojomStruct _http_server_HttpHandler_HandleRequest_Params__() {
 | 
| +  return new mojom_types.MojomStruct()
 | 
| +    ..declData = (new mojom_types.DeclarationData()..shortName = 'HttpHandlerHandleRequestParams')
 | 
| +    ..fields = <mojom_types.StructField>[
 | 
| +      new mojom_types.StructField()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = 'Request')
 | 
| +        ..type = (new mojom_types.Type()
 | 
| +    ..typeReference = (new mojom_types.TypeReference()
 | 
| +  
 | 
| +    ..identifier = '_http_request_HttpRequest__'
 | 
| +    ..typeKey = '_http_request_HttpRequest__'
 | 
| +  )),
 | 
| +      ];
 | 
| +}
 | 
| +
 | 
|  
 | 
|  class HttpHandlerHandleRequestResponseParams extends bindings.Struct {
 | 
|    static const List<bindings.StructDataHeader> kVersions = const [
 | 
| @@ -412,12 +475,57 @@ class HttpHandlerHandleRequestResponseParams extends bindings.Struct {
 | 
|    }
 | 
|  }
 | 
|  
 | 
| +mojom_types.MojomStruct _http_server_HttpHandler_HandleRequest_ResponseParams__() {
 | 
| +  return new mojom_types.MojomStruct()
 | 
| +    ..declData = (new mojom_types.DeclarationData()..shortName = 'HttpHandlerHandleRequestResponseParams')
 | 
| +    ..fields = <mojom_types.StructField>[
 | 
| +      new mojom_types.StructField()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = 'Response')
 | 
| +        ..type = (new mojom_types.Type()
 | 
| +    ..typeReference = (new mojom_types.TypeReference()
 | 
| +  
 | 
| +    ..identifier = '_http_response_HttpResponse__'
 | 
| +    ..typeKey = '_http_response_HttpResponse__'
 | 
| +  )),
 | 
| +      ];
 | 
| +}
 | 
| +
 | 
| +
 | 
|  const int kHttpServer_setHandler_name = 0;
 | 
|  const int kHttpServer_getPort_name = 1;
 | 
|  
 | 
|  const String HttpServerName =
 | 
|        'http_server::HttpServer';
 | 
|  
 | 
| +mojom_types.MojomInterface _http_server_HttpServer__() {
 | 
| +  return new mojom_types.MojomInterface()
 | 
| +    ..declData = (new mojom_types.DeclarationData()..shortName = "HttpServer")
 | 
| +    ..interfaceName = "HttpServer"
 | 
| +    ..methods = <int, mojom_types.MojomMethod>{
 | 
| +kHttpServer_setHandler_name: new mojom_types.MojomMethod()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = "SetHandler")
 | 
| +        ..ordinal = kHttpServer_setHandler_name
 | 
| +        ..responseParams = _http_server_HttpServer_SetHandler_ResponseParams__()..parameters = _http_server_HttpServer_SetHandler_Params__(),kHttpServer_getPort_name: new mojom_types.MojomMethod()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = "GetPort")
 | 
| +        ..ordinal = kHttpServer_getPort_name
 | 
| +        ..responseParams = _http_server_HttpServer_GetPort_ResponseParams__()..parameters = _http_server_HttpServer_GetPort_Params__(),
 | 
| +    };
 | 
| +}
 | 
| +
 | 
| +class _HttpServerServiceDescription extends service_describer.ServiceDescription {
 | 
| +  // Avoid infinite loop by overriding serviceDescription field.
 | 
| +  final service_describer.ServiceDescription serviceDescription = null;
 | 
| +dynamic getTopLevelInterface([Function responseFactory = null]) {
 | 
| +    return _http_server_HttpServer__();
 | 
| +  }
 | 
| +  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
 | 
| +    return getAllMojomTypeDefinitions()[typeKey];
 | 
| +  }
 | 
| +  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
 | 
| +    return getAllMojomTypeDefinitions();
 | 
| +  }
 | 
| +}
 | 
| +
 | 
|  abstract class HttpServer {
 | 
|    dynamic setHandler(String pattern,Object handler,[Function responseFactory = null]);
 | 
|    dynamic getPort([Function responseFactory = null]);
 | 
| @@ -442,6 +550,9 @@ class HttpServerProxyImpl extends bindings.Proxy {
 | 
|  
 | 
|    String get name => HttpServerName;
 | 
|  
 | 
| +  service_describer.ServiceDescription get serviceDescription =>
 | 
| +    new _HttpServerServiceDescription();
 | 
| +
 | 
|    void handleResponse(bindings.ServiceMessage message) {
 | 
|      switch (message.header.type) {
 | 
|        case kHttpServer_setHandler_name:
 | 
| @@ -684,6 +795,9 @@ class HttpServerStub extends bindings.Stub {
 | 
|    }
 | 
|  
 | 
|    int get version => 0;
 | 
| +
 | 
| +  service_describer.ServiceDescription get serviceDescription =>
 | 
| +    new _HttpServerServiceDescription();
 | 
|  }
 | 
|  
 | 
|  const int kHttpHandler_handleRequest_name = 0;
 | 
| @@ -691,6 +805,32 @@ const int kHttpHandler_handleRequest_name = 0;
 | 
|  const String HttpHandlerName =
 | 
|        'http_server::HttpHandler';
 | 
|  
 | 
| +mojom_types.MojomInterface _http_server_HttpHandler__() {
 | 
| +  return new mojom_types.MojomInterface()
 | 
| +    ..declData = (new mojom_types.DeclarationData()..shortName = "HttpHandler")
 | 
| +    ..interfaceName = "HttpHandler"
 | 
| +    ..methods = <int, mojom_types.MojomMethod>{
 | 
| +kHttpHandler_handleRequest_name: new mojom_types.MojomMethod()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = "HandleRequest")
 | 
| +        ..ordinal = kHttpHandler_handleRequest_name
 | 
| +        ..responseParams = _http_server_HttpHandler_HandleRequest_ResponseParams__()..parameters = _http_server_HttpHandler_HandleRequest_Params__(),
 | 
| +    };
 | 
| +}
 | 
| +
 | 
| +class _HttpHandlerServiceDescription extends service_describer.ServiceDescription {
 | 
| +  // Avoid infinite loop by overriding serviceDescription field.
 | 
| +  final service_describer.ServiceDescription serviceDescription = null;
 | 
| +dynamic getTopLevelInterface([Function responseFactory = null]) {
 | 
| +    return _http_server_HttpHandler__();
 | 
| +  }
 | 
| +  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
 | 
| +    return getAllMojomTypeDefinitions()[typeKey];
 | 
| +  }
 | 
| +  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
 | 
| +    return getAllMojomTypeDefinitions();
 | 
| +  }
 | 
| +}
 | 
| +
 | 
|  abstract class HttpHandler {
 | 
|    dynamic handleRequest(http_request_mojom.HttpRequest request,[Function responseFactory = null]);
 | 
|  
 | 
| @@ -714,6 +854,9 @@ class HttpHandlerProxyImpl extends bindings.Proxy {
 | 
|  
 | 
|    String get name => HttpHandlerName;
 | 
|  
 | 
| +  service_describer.ServiceDescription get serviceDescription =>
 | 
| +    new _HttpHandlerServiceDescription();
 | 
| +
 | 
|    void handleResponse(bindings.ServiceMessage message) {
 | 
|      switch (message.header.type) {
 | 
|        case kHttpHandler_handleRequest_name:
 | 
| @@ -900,6 +1043,91 @@ class HttpHandlerStub extends bindings.Stub {
 | 
|    }
 | 
|  
 | 
|    int get version => 0;
 | 
| +
 | 
| +  service_describer.ServiceDescription get serviceDescription =>
 | 
| +    new _HttpHandlerServiceDescription();
 | 
| +}
 | 
| +
 | 
| +
 | 
| +
 | 
| +
 | 
| +
 | 
| +
 | 
| +
 | 
| +
 | 
| +var _MojomDesc__ = _initDescriptions();
 | 
| +
 | 
| +Map<String, mojom_types.UserDefinedType> _initDescriptions() {
 | 
| +  var map = new Map<String, mojom_types.UserDefinedType>();
 | 
| +  
 | 
| +  map["_http_server_HttpServer_SetHandler_Params__"] =
 | 
| +    new mojom_types.UserDefinedType()
 | 
| +      ..structType = _http_server_HttpServer_SetHandler_Params__();
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  map["_http_server_HttpHandler__"] =
 | 
| +    new mojom_types.UserDefinedType()
 | 
| +      ..interfaceType = _http_server_HttpHandler__();
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +  map["_http_server_HttpServer_SetHandler_ResponseParams__"] =
 | 
| +    new mojom_types.UserDefinedType()
 | 
| +      ..structType = _http_server_HttpServer_SetHandler_ResponseParams__();
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +  map["_http_server_HttpServer_GetPort_Params__"] =
 | 
| +    new mojom_types.UserDefinedType()
 | 
| +      ..structType = _http_server_HttpServer_GetPort_Params__();
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +  map["_http_server_HttpServer_GetPort_ResponseParams__"] =
 | 
| +    new mojom_types.UserDefinedType()
 | 
| +      ..structType = _http_server_HttpServer_GetPort_ResponseParams__();
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +  map["_http_server_HttpHandler_HandleRequest_Params__"] =
 | 
| +    new mojom_types.UserDefinedType()
 | 
| +      ..structType = _http_server_HttpHandler_HandleRequest_Params__();
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +  map["_http_server_HttpHandler_HandleRequest_ResponseParams__"] =
 | 
| +    new mojom_types.UserDefinedType()
 | 
| +      ..structType = _http_server_HttpHandler_HandleRequest_ResponseParams__();
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +  map["_http_server_HttpServer__"] =
 | 
| +    new mojom_types.UserDefinedType()
 | 
| +      ..interfaceType = _http_server_HttpServer__();
 | 
| +
 | 
| +  
 | 
| +http_request_mojom.getAllMojomTypeDefinitions().forEach((String s, mojom_types.UserDefinedType udt) {
 | 
| +  map[s] = udt;
 | 
| +});
 | 
| +http_response_mojom.getAllMojomTypeDefinitions().forEach((String s, mojom_types.UserDefinedType udt) {
 | 
| +  map[s] = udt;
 | 
| +});
 | 
| +  return map;
 | 
| +}
 | 
| +
 | 
| +Map<String, mojom_types.UserDefinedType> getAllMojomTypeDefinitions() {
 | 
| +  return _MojomDesc__;
 | 
|  }
 | 
|  
 | 
|  
 | 
| 
 |