| Index: mojo/dart/packages/mojo_services/lib/mojo/http_connection.mojom.dart
 | 
| diff --git a/mojo/dart/packages/mojo_services/lib/mojo/http_connection.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/http_connection.mojom.dart
 | 
| index 540bfa202aeb4b2d8bb854c40080cba9edd5bde2..a6b9cc1baeb17e3fe4368c7551d8a0fe96c59dbe 100644
 | 
| --- a/mojo/dart/packages/mojo_services/lib/mojo/http_connection.mojom.dart
 | 
| +++ b/mojo/dart/packages/mojo_services/lib/mojo/http_connection.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/mojo/network_error.mojom.dart' as network_error_mojom;
 | 
|  import 'package:mojo_services/mojo/http_message.mojom.dart' as http_message_mojom;
 | 
|  import 'package:mojo_services/mojo/web_socket.mojom.dart' as web_socket_mojom;
 | 
| @@ -80,6 +82,16 @@ class HttpConnectionSetSendBufferSizeParams extends bindings.Struct {
 | 
|    }
 | 
|  }
 | 
|  
 | 
| +mojom_types.MojomStruct _http_connection_HttpConnection_SetSendBufferSize_Params__() {
 | 
| +  return new mojom_types.MojomStruct()
 | 
| +    ..declData = (new mojom_types.DeclarationData()..shortName = 'HttpConnectionSetSendBufferSizeParams')
 | 
| +    ..fields = <mojom_types.StructField>[
 | 
| +      new mojom_types.StructField()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = 'Size')
 | 
| +        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.UINT32),
 | 
| +      ];
 | 
| +}
 | 
| +
 | 
|  
 | 
|  class HttpConnectionSetSendBufferSizeResponseParams extends bindings.Struct {
 | 
|    static const List<bindings.StructDataHeader> kVersions = const [
 | 
| @@ -148,6 +160,21 @@ class HttpConnectionSetSendBufferSizeResponseParams extends bindings.Struct {
 | 
|    }
 | 
|  }
 | 
|  
 | 
| +mojom_types.MojomStruct _http_connection_HttpConnection_SetSendBufferSize_ResponseParams__() {
 | 
| +  return new mojom_types.MojomStruct()
 | 
| +    ..declData = (new mojom_types.DeclarationData()..shortName = 'HttpConnectionSetSendBufferSizeResponseParams')
 | 
| +    ..fields = <mojom_types.StructField>[
 | 
| +      new mojom_types.StructField()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = 'Result')
 | 
| +        ..type = (new mojom_types.Type()
 | 
| +    ..typeReference = (new mojom_types.TypeReference()
 | 
| +  
 | 
| +    ..identifier = '_network_error_NetworkError__'
 | 
| +    ..typeKey = '_network_error_NetworkError__'
 | 
| +  )),
 | 
| +      ];
 | 
| +}
 | 
| +
 | 
|  
 | 
|  class HttpConnectionSetReceiveBufferSizeParams extends bindings.Struct {
 | 
|    static const List<bindings.StructDataHeader> kVersions = const [
 | 
| @@ -215,6 +242,16 @@ class HttpConnectionSetReceiveBufferSizeParams extends bindings.Struct {
 | 
|    }
 | 
|  }
 | 
|  
 | 
| +mojom_types.MojomStruct _http_connection_HttpConnection_SetReceiveBufferSize_Params__() {
 | 
| +  return new mojom_types.MojomStruct()
 | 
| +    ..declData = (new mojom_types.DeclarationData()..shortName = 'HttpConnectionSetReceiveBufferSizeParams')
 | 
| +    ..fields = <mojom_types.StructField>[
 | 
| +      new mojom_types.StructField()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = 'Size')
 | 
| +        ..type = (new mojom_types.Type()..simpleType = mojom_types.SimpleType.UINT32),
 | 
| +      ];
 | 
| +}
 | 
| +
 | 
|  
 | 
|  class HttpConnectionSetReceiveBufferSizeResponseParams extends bindings.Struct {
 | 
|    static const List<bindings.StructDataHeader> kVersions = const [
 | 
| @@ -283,6 +320,21 @@ class HttpConnectionSetReceiveBufferSizeResponseParams extends bindings.Struct {
 | 
|    }
 | 
|  }
 | 
|  
 | 
| +mojom_types.MojomStruct _http_connection_HttpConnection_SetReceiveBufferSize_ResponseParams__() {
 | 
| +  return new mojom_types.MojomStruct()
 | 
| +    ..declData = (new mojom_types.DeclarationData()..shortName = 'HttpConnectionSetReceiveBufferSizeResponseParams')
 | 
| +    ..fields = <mojom_types.StructField>[
 | 
| +      new mojom_types.StructField()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = 'Result')
 | 
| +        ..type = (new mojom_types.Type()
 | 
| +    ..typeReference = (new mojom_types.TypeReference()
 | 
| +  
 | 
| +    ..identifier = '_network_error_NetworkError__'
 | 
| +    ..typeKey = '_network_error_NetworkError__'
 | 
| +  )),
 | 
| +      ];
 | 
| +}
 | 
| +
 | 
|  
 | 
|  class HttpConnectionDelegateOnReceivedRequestParams extends bindings.Struct {
 | 
|    static const List<bindings.StructDataHeader> kVersions = const [
 | 
| @@ -350,6 +402,21 @@ class HttpConnectionDelegateOnReceivedRequestParams extends bindings.Struct {
 | 
|    }
 | 
|  }
 | 
|  
 | 
| +mojom_types.MojomStruct _http_connection_HttpConnectionDelegate_OnReceivedRequest_Params__() {
 | 
| +  return new mojom_types.MojomStruct()
 | 
| +    ..declData = (new mojom_types.DeclarationData()..shortName = 'HttpConnectionDelegateOnReceivedRequestParams')
 | 
| +    ..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_message_HttpRequest__'
 | 
| +    ..typeKey = '_http_message_HttpRequest__'
 | 
| +  )),
 | 
| +      ];
 | 
| +}
 | 
| +
 | 
|  
 | 
|  class HttpConnectionDelegateOnReceivedRequestResponseParams extends bindings.Struct {
 | 
|    static const List<bindings.StructDataHeader> kVersions = const [
 | 
| @@ -417,6 +484,21 @@ class HttpConnectionDelegateOnReceivedRequestResponseParams extends bindings.Str
 | 
|    }
 | 
|  }
 | 
|  
 | 
| +mojom_types.MojomStruct _http_connection_HttpConnectionDelegate_OnReceivedRequest_ResponseParams__() {
 | 
| +  return new mojom_types.MojomStruct()
 | 
| +    ..declData = (new mojom_types.DeclarationData()..shortName = 'HttpConnectionDelegateOnReceivedRequestResponseParams')
 | 
| +    ..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_message_HttpResponse__'
 | 
| +    ..typeKey = '_http_message_HttpResponse__'
 | 
| +  )),
 | 
| +      ];
 | 
| +}
 | 
| +
 | 
|  
 | 
|  class HttpConnectionDelegateOnReceivedWebSocketRequestParams extends bindings.Struct {
 | 
|    static const List<bindings.StructDataHeader> kVersions = const [
 | 
| @@ -484,6 +566,21 @@ class HttpConnectionDelegateOnReceivedWebSocketRequestParams extends bindings.St
 | 
|    }
 | 
|  }
 | 
|  
 | 
| +mojom_types.MojomStruct _http_connection_HttpConnectionDelegate_OnReceivedWebSocketRequest_Params__() {
 | 
| +  return new mojom_types.MojomStruct()
 | 
| +    ..declData = (new mojom_types.DeclarationData()..shortName = 'HttpConnectionDelegateOnReceivedWebSocketRequestParams')
 | 
| +    ..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_message_HttpRequest__'
 | 
| +    ..typeKey = '_http_message_HttpRequest__'
 | 
| +  )),
 | 
| +      ];
 | 
| +}
 | 
| +
 | 
|  
 | 
|  class HttpConnectionDelegateOnReceivedWebSocketRequestResponseParams extends bindings.Struct {
 | 
|    static const List<bindings.StructDataHeader> kVersions = const [
 | 
| @@ -566,12 +663,78 @@ class HttpConnectionDelegateOnReceivedWebSocketRequestResponseParams extends bin
 | 
|    }
 | 
|  }
 | 
|  
 | 
| +mojom_types.MojomStruct _http_connection_HttpConnectionDelegate_OnReceivedWebSocketRequest_ResponseParams__() {
 | 
| +  return new mojom_types.MojomStruct()
 | 
| +    ..declData = (new mojom_types.DeclarationData()..shortName = 'HttpConnectionDelegateOnReceivedWebSocketRequestResponseParams')
 | 
| +    ..fields = <mojom_types.StructField>[
 | 
| +      new mojom_types.StructField()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = 'WebSocket')
 | 
| +        ..type = (new mojom_types.Type()
 | 
| +    ..typeReference = (new mojom_types.TypeReference()
 | 
| +    ..nullable = true
 | 
| +  
 | 
| +  
 | 
| +    ..isInterfaceRequest = true
 | 
| +    ..identifier = '_web_socket_WebSocket__'
 | 
| +    ..typeKey = '_web_socket_WebSocket__'
 | 
| +  )),
 | 
| +      
 | 
| +      new mojom_types.StructField()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = 'SendStream')
 | 
| +        ..type = (new mojom_types.Type()
 | 
| +..handleType = (new mojom_types.HandleType()
 | 
| +..kind = mojom_types.HandleTypeKind.DATA_PIPE_CONSUMER
 | 
| +..nullable = true)),
 | 
| +      
 | 
| +      new mojom_types.StructField()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = 'Client')
 | 
| +        ..type = (new mojom_types.Type()
 | 
| +    ..typeReference = (new mojom_types.TypeReference()
 | 
| +    ..nullable = true
 | 
| +  
 | 
| +  
 | 
| +    ..identifier = '_web_socket_WebSocketClient__'
 | 
| +    ..typeKey = '_web_socket_WebSocketClient__'
 | 
| +  )),
 | 
| +      ];
 | 
| +}
 | 
| +
 | 
| +
 | 
|  const int kHttpConnection_setSendBufferSize_name = 0;
 | 
|  const int kHttpConnection_setReceiveBufferSize_name = 1;
 | 
|  
 | 
|  const String HttpConnectionName =
 | 
|        'mojo::HttpConnection';
 | 
|  
 | 
| +mojom_types.MojomInterface _http_connection_HttpConnection__() {
 | 
| +  return new mojom_types.MojomInterface()
 | 
| +    ..declData = (new mojom_types.DeclarationData()..shortName = "HttpConnection")
 | 
| +    ..interfaceName = "HttpConnection"
 | 
| +    ..methods = <int, mojom_types.MojomMethod>{
 | 
| +kHttpConnection_setSendBufferSize_name: new mojom_types.MojomMethod()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = "SetSendBufferSize")
 | 
| +        ..ordinal = kHttpConnection_setSendBufferSize_name
 | 
| +        ..responseParams = _http_connection_HttpConnection_SetSendBufferSize_ResponseParams__()..parameters = _http_connection_HttpConnection_SetSendBufferSize_Params__(),kHttpConnection_setReceiveBufferSize_name: new mojom_types.MojomMethod()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = "SetReceiveBufferSize")
 | 
| +        ..ordinal = kHttpConnection_setReceiveBufferSize_name
 | 
| +        ..responseParams = _http_connection_HttpConnection_SetReceiveBufferSize_ResponseParams__()..parameters = _http_connection_HttpConnection_SetReceiveBufferSize_Params__(),
 | 
| +    };
 | 
| +}
 | 
| +
 | 
| +class _HttpConnectionServiceDescription extends service_describer.ServiceDescription {
 | 
| +  // Avoid infinite loop by overriding serviceDescription field.
 | 
| +  final service_describer.ServiceDescription serviceDescription = null;
 | 
| +dynamic getTopLevelInterface([Function responseFactory = null]) {
 | 
| +    return _http_connection_HttpConnection__();
 | 
| +  }
 | 
| +  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
 | 
| +    return getAllMojomTypeDefinitions()[typeKey];
 | 
| +  }
 | 
| +  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
 | 
| +    return getAllMojomTypeDefinitions();
 | 
| +  }
 | 
| +}
 | 
| +
 | 
|  abstract class HttpConnection {
 | 
|    dynamic setSendBufferSize(int size,[Function responseFactory = null]);
 | 
|    dynamic setReceiveBufferSize(int size,[Function responseFactory = null]);
 | 
| @@ -596,6 +759,9 @@ class HttpConnectionProxyImpl extends bindings.Proxy {
 | 
|  
 | 
|    String get name => HttpConnectionName;
 | 
|  
 | 
| +  service_describer.ServiceDescription get serviceDescription =>
 | 
| +    new _HttpConnectionServiceDescription();
 | 
| +
 | 
|    void handleResponse(bindings.ServiceMessage message) {
 | 
|      switch (message.header.type) {
 | 
|        case kHttpConnection_setSendBufferSize_name:
 | 
| @@ -838,6 +1004,9 @@ class HttpConnectionStub extends bindings.Stub {
 | 
|    }
 | 
|  
 | 
|    int get version => 0;
 | 
| +
 | 
| +  service_describer.ServiceDescription get serviceDescription =>
 | 
| +    new _HttpConnectionServiceDescription();
 | 
|  }
 | 
|  
 | 
|  const int kHttpConnectionDelegate_onReceivedRequest_name = 0;
 | 
| @@ -846,6 +1015,35 @@ const int kHttpConnectionDelegate_onReceivedWebSocketRequest_name = 1;
 | 
|  const String HttpConnectionDelegateName =
 | 
|        'mojo::HttpConnectionDelegate';
 | 
|  
 | 
| +mojom_types.MojomInterface _http_connection_HttpConnectionDelegate__() {
 | 
| +  return new mojom_types.MojomInterface()
 | 
| +    ..declData = (new mojom_types.DeclarationData()..shortName = "HttpConnectionDelegate")
 | 
| +    ..interfaceName = "HttpConnectionDelegate"
 | 
| +    ..methods = <int, mojom_types.MojomMethod>{
 | 
| +kHttpConnectionDelegate_onReceivedRequest_name: new mojom_types.MojomMethod()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = "OnReceivedRequest")
 | 
| +        ..ordinal = kHttpConnectionDelegate_onReceivedRequest_name
 | 
| +        ..responseParams = _http_connection_HttpConnectionDelegate_OnReceivedRequest_ResponseParams__()..parameters = _http_connection_HttpConnectionDelegate_OnReceivedRequest_Params__(),kHttpConnectionDelegate_onReceivedWebSocketRequest_name: new mojom_types.MojomMethod()
 | 
| +        ..declData = (new mojom_types.DeclarationData()..shortName = "OnReceivedWebSocketRequest")
 | 
| +        ..ordinal = kHttpConnectionDelegate_onReceivedWebSocketRequest_name
 | 
| +        ..responseParams = _http_connection_HttpConnectionDelegate_OnReceivedWebSocketRequest_ResponseParams__()..parameters = _http_connection_HttpConnectionDelegate_OnReceivedWebSocketRequest_Params__(),
 | 
| +    };
 | 
| +}
 | 
| +
 | 
| +class _HttpConnectionDelegateServiceDescription extends service_describer.ServiceDescription {
 | 
| +  // Avoid infinite loop by overriding serviceDescription field.
 | 
| +  final service_describer.ServiceDescription serviceDescription = null;
 | 
| +dynamic getTopLevelInterface([Function responseFactory = null]) {
 | 
| +    return _http_connection_HttpConnectionDelegate__();
 | 
| +  }
 | 
| +  dynamic getTypeDefinition(String typeKey,[Function responseFactory = null]) {
 | 
| +    return getAllMojomTypeDefinitions()[typeKey];
 | 
| +  }
 | 
| +  dynamic getAllTypeDefinitions([Function responseFactory = null]) {
 | 
| +    return getAllMojomTypeDefinitions();
 | 
| +  }
 | 
| +}
 | 
| +
 | 
|  abstract class HttpConnectionDelegate {
 | 
|    dynamic onReceivedRequest(http_message_mojom.HttpRequest request,[Function responseFactory = null]);
 | 
|    dynamic onReceivedWebSocketRequest(http_message_mojom.HttpRequest request,[Function responseFactory = null]);
 | 
| @@ -870,6 +1068,9 @@ class HttpConnectionDelegateProxyImpl extends bindings.Proxy {
 | 
|  
 | 
|    String get name => HttpConnectionDelegateName;
 | 
|  
 | 
| +  service_describer.ServiceDescription get serviceDescription =>
 | 
| +    new _HttpConnectionDelegateServiceDescription();
 | 
| +
 | 
|    void handleResponse(bindings.ServiceMessage message) {
 | 
|      switch (message.header.type) {
 | 
|        case kHttpConnectionDelegate_onReceivedRequest_name:
 | 
| @@ -1114,6 +1315,114 @@ class HttpConnectionDelegateStub extends bindings.Stub {
 | 
|    }
 | 
|  
 | 
|    int get version => 0;
 | 
| +
 | 
| +  service_describer.ServiceDescription get serviceDescription =>
 | 
| +    new _HttpConnectionDelegateServiceDescription();
 | 
| +}
 | 
| +
 | 
| +
 | 
| +
 | 
| +
 | 
| +
 | 
| +
 | 
| +
 | 
| +
 | 
| +var _MojomDesc__ = _initDescriptions();
 | 
| +
 | 
| +Map<String, mojom_types.UserDefinedType> _initDescriptions() {
 | 
| +  var map = new Map<String, mojom_types.UserDefinedType>();
 | 
| +  
 | 
| +  map["_http_connection_HttpConnection_SetSendBufferSize_Params__"] =
 | 
| +    new mojom_types.UserDefinedType()
 | 
| +      ..structType = _http_connection_HttpConnection_SetSendBufferSize_Params__();
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +  map["_http_connection_HttpConnection_SetSendBufferSize_ResponseParams__"] =
 | 
| +    new mojom_types.UserDefinedType()
 | 
| +      ..structType = _http_connection_HttpConnection_SetSendBufferSize_ResponseParams__();
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +  map["_http_connection_HttpConnection_SetReceiveBufferSize_Params__"] =
 | 
| +    new mojom_types.UserDefinedType()
 | 
| +      ..structType = _http_connection_HttpConnection_SetReceiveBufferSize_Params__();
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +  map["_http_connection_HttpConnection_SetReceiveBufferSize_ResponseParams__"] =
 | 
| +    new mojom_types.UserDefinedType()
 | 
| +      ..structType = _http_connection_HttpConnection_SetReceiveBufferSize_ResponseParams__();
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +  map["_http_connection_HttpConnectionDelegate_OnReceivedRequest_Params__"] =
 | 
| +    new mojom_types.UserDefinedType()
 | 
| +      ..structType = _http_connection_HttpConnectionDelegate_OnReceivedRequest_Params__();
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +  map["_http_connection_HttpConnectionDelegate_OnReceivedRequest_ResponseParams__"] =
 | 
| +    new mojom_types.UserDefinedType()
 | 
| +      ..structType = _http_connection_HttpConnectionDelegate_OnReceivedRequest_ResponseParams__();
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +  map["_http_connection_HttpConnectionDelegate_OnReceivedWebSocketRequest_Params__"] =
 | 
| +    new mojom_types.UserDefinedType()
 | 
| +      ..structType = _http_connection_HttpConnectionDelegate_OnReceivedWebSocketRequest_Params__();
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +  map["_http_connection_HttpConnectionDelegate_OnReceivedWebSocketRequest_ResponseParams__"] =
 | 
| +    new mojom_types.UserDefinedType()
 | 
| +      ..structType = _http_connection_HttpConnectionDelegate_OnReceivedWebSocketRequest_ResponseParams__();
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +
 | 
| +  
 | 
| +  map["_http_connection_HttpConnection__"] =
 | 
| +    new mojom_types.UserDefinedType()
 | 
| +      ..interfaceType = _http_connection_HttpConnection__();
 | 
| +
 | 
| +  
 | 
| +  map["_http_connection_HttpConnectionDelegate__"] =
 | 
| +    new mojom_types.UserDefinedType()
 | 
| +      ..interfaceType = _http_connection_HttpConnectionDelegate__();
 | 
| +
 | 
| +network_error_mojom.getAllMojomTypeDefinitions().forEach((String s, mojom_types.UserDefinedType udt) {
 | 
| +  map[s] = udt;
 | 
| +});
 | 
| +http_message_mojom.getAllMojomTypeDefinitions().forEach((String s, mojom_types.UserDefinedType udt) {
 | 
| +  map[s] = udt;
 | 
| +});
 | 
| +web_socket_mojom.getAllMojomTypeDefinitions().forEach((String s, mojom_types.UserDefinedType udt) {
 | 
| +  map[s] = udt;
 | 
| +});
 | 
| +  return map;
 | 
| +}
 | 
| +
 | 
| +Map<String, mojom_types.UserDefinedType> getAllMojomTypeDefinitions() {
 | 
| +  return _MojomDesc__;
 | 
|  }
 | 
|  
 | 
|  
 | 
| 
 |