Dart: Adds Interface and InterfaceRequest interfaces.

mojo/dart/packages/mojo_services/lib/icu_data/icu_data.mojom.dart

Index: mojo/dart/packages/mojo_services/lib/icu_data/icu_data.mojom.dart
diff --git a/mojo/dart/packages/mojo_services/lib/icu_data/icu_data.mojom.dart b/mojo/dart/packages/mojo_services/lib/icu_data/icu_data.mojom.dart
index 2e67a73f803b12c5bc2bf4bdd13f468a0f92ed49..f925c112c36cc900a36e4029a2c8f16da70376fa 100644
--- a/mojo/dart/packages/mojo_services/lib/icu_data/icu_data.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/icu_data/icu_data.mojom.dart
@@ -167,12 +167,50 @@ class _IcuDataServiceDescription implements service_describer.ServiceDescription
 
 abstract class IcuData {
   static const String serviceName = "icu_data::ICUData";
+
+  static service_describer.ServiceDescription _cachedServiceDescription;
+  static service_describer.ServiceDescription get serviceDescription {
+    if (_cachedServiceDescription == null) {
+      _cachedServiceDescription = new _IcuDataServiceDescription();
+    }
+    return _cachedServiceDescription;
+  }
+
+  static IcuDataProxy connectToService(
+      bindings.ServiceConnector s, String url, [String serviceName]) {
+    IcuDataProxy p = new IcuDataProxy.unbound();
+    String name = serviceName ?? IcuData.serviceName;
+    if ((name == null) || name.isEmpty) {
+      throw new core.MojoApiError(
+          "If an interface has no ServiceName, then one must be provided.");
+    }
+    s.connectToService(url, p, name);
+    return p;
+  }
   dynamic map(String sha1hash,[Function responseFactory = null]);
 }
 
+abstract class IcuDataInterface
+    implements bindings.MojoInterface<IcuData>,
+               IcuData {
+  factory IcuDataInterface([IcuData impl]) =>
+      new IcuDataStub.unbound(impl);
+  factory IcuDataInterface.fromEndpoint(
+      core.MojoMessagePipeEndpoint endpoint,
+      [IcuData impl]) =>
+      new IcuDataStub.fromEndpoint(endpoint, impl);
+}
+
+abstract class IcuDataInterfaceRequest
+    implements bindings.MojoInterface<IcuData>,
+               IcuData {
+  factory IcuDataInterfaceRequest() =>
+      new IcuDataProxy.unbound();
+}
+
 class _IcuDataProxyControl
     extends bindings.ProxyMessageHandler
-    implements bindings.ProxyControl {
+    implements bindings.ProxyControl<IcuData> {
   _IcuDataProxyControl.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) : super.fromEndpoint(endpoint);
 
@@ -181,9 +219,6 @@ class _IcuDataProxyControl
 
   _IcuDataProxyControl.unbound() : super.unbound();
 
-  service_describer.ServiceDescription get serviceDescription =>
-      new _IcuDataServiceDescription();
-
   String get serviceName => IcuData.serviceName;
 
   void handleResponse(bindings.ServiceMessage message) {
@@ -215,6 +250,11 @@ class _IcuDataProxyControl
     }
   }
 
+  IcuData get impl => null;
+  set impl(IcuData _) {
+    throw new core.MojoApiError("The impl of a Proxy cannot be set.");
+  }
+
   @override
   String toString() {
     var superString = super.toString();
@@ -223,8 +263,10 @@ class _IcuDataProxyControl
 }
 
 class IcuDataProxy
-    extends bindings.Proxy
-    implements IcuData {
+    extends bindings.Proxy<IcuData>
+    implements IcuData,
+               IcuDataInterface,
+               IcuDataInterfaceRequest {
   IcuDataProxy.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint)
       : super(new _IcuDataProxyControl.fromEndpoint(endpoint));
@@ -241,13 +283,6 @@ class IcuDataProxy
     return new IcuDataProxy.fromEndpoint(endpoint);
   }
 
-  factory IcuDataProxy.connectToService(
-      bindings.ServiceConnector s, String url, [String serviceName]) {
-    IcuDataProxy p = new IcuDataProxy.unbound();
-    s.connectToService(url, p, serviceName);
-    return p;
-  }
-
 
   dynamic map(String sha1hash,[Function responseFactory = null]) {
     var params = new _IcuDataMapParams();
@@ -279,6 +314,8 @@ class _IcuDataStubControl
 
   _IcuDataStubControl.unbound([this._impl]) : super.unbound();
 
+  String get serviceName => IcuData.serviceName;
+
 
   IcuDataMapResponseParams _icuDataMapResponseParamsFactory(core.MojoSharedBuffer icuData) {
     var result = new IcuDataMapResponseParams();
@@ -351,19 +388,16 @@ class _IcuDataStubControl
   }
 
   int get version => 0;
-
-  static service_describer.ServiceDescription _cachedServiceDescription;
-  static service_describer.ServiceDescription get serviceDescription {
-    if (_cachedServiceDescription == null) {
-      _cachedServiceDescription = new _IcuDataServiceDescription();
-    }
-    return _cachedServiceDescription;
-  }
 }
 
 class IcuDataStub
     extends bindings.Stub<IcuData>
-    implements IcuData {
+    implements IcuData,
+               IcuDataInterface,
+               IcuDataInterfaceRequest {
+  IcuDataStub.unbound([IcuData impl])
+      : super(new _IcuDataStubControl.unbound(impl));
+
   IcuDataStub.fromEndpoint(
       core.MojoMessagePipeEndpoint endpoint, [IcuData impl])
       : super(new _IcuDataStubControl.fromEndpoint(endpoint, impl));
@@ -372,18 +406,12 @@ class IcuDataStub
       core.MojoHandle handle, [IcuData impl])
       : super(new _IcuDataStubControl.fromHandle(handle, impl));
 
-  IcuDataStub.unbound([IcuData impl])
-      : super(new _IcuDataStubControl.unbound(impl));
-
   static IcuDataStub newFromEndpoint(
       core.MojoMessagePipeEndpoint endpoint) {
     assert(endpoint.setDescription("For IcuDataStub"));
     return new IcuDataStub.fromEndpoint(endpoint);
   }
 
-  static service_describer.ServiceDescription get serviceDescription =>
-      _IcuDataStubControl.serviceDescription;
-
 
   dynamic map(String sha1hash,[Function responseFactory = null]) {
     return impl.map(sha1hash,responseFactory);