Regenerate Dart .mojom files

mojo/dart/packages/_mojo_for_test_only/lib/sample/sample_interfaces.mojom.dart

Index: mojo/dart/packages/_mojo_for_test_only/lib/sample/sample_interfaces.mojom.dart
diff --git a/mojo/dart/packages/_mojo_for_test_only/lib/sample/sample_interfaces.mojom.dart b/mojo/dart/packages/_mojo_for_test_only/lib/sample/sample_interfaces.mojom.dart
index 07c0f25f0da3dd0227965905383280dad5910a7c..a931784790e12a5b9a5787f93b4214c3ecfbfa73 100644
--- a/mojo/dart/packages/_mojo_for_test_only/lib/sample/sample_interfaces.mojom.dart
+++ b/mojo/dart/packages/_mojo_for_test_only/lib/sample/sample_interfaces.mojom.dart
@@ -969,16 +969,14 @@ class _IntegerAccessorSetIntegerParams extends bindings.Struct {
 }
 
 
-class _SampleInterfaceSampleMethod1Params extends bindings.Struct {
+class _SampleInterfaceSampleMethod0Params extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
-    const bindings.StructDataHeader(24, 0)
+    const bindings.StructDataHeader(8, 0)
   ];
-  int in1 = 0;
-  String in2 = null;
 
-  _SampleInterfaceSampleMethod1Params() : super(kVersions.last.size);
+  _SampleInterfaceSampleMethod0Params() : super(kVersions.last.size);
 
-  static _SampleInterfaceSampleMethod1Params deserialize(bindings.Message message) {
+  static _SampleInterfaceSampleMethod0Params deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
@@ -987,11 +985,11 @@ class _SampleInterfaceSampleMethod1Params extends bindings.Struct {
     return result;
   }
 
-  static _SampleInterfaceSampleMethod1Params decode(bindings.Decoder decoder0) {
+  static _SampleInterfaceSampleMethod0Params decode(bindings.Decoder decoder0) {
     if (decoder0 == null) {
       return null;
     }
-    _SampleInterfaceSampleMethod1Params result = new _SampleInterfaceSampleMethod1Params();
+    _SampleInterfaceSampleMethod0Params result = new _SampleInterfaceSampleMethod0Params();
 
     var mainDataHeader = decoder0.decodeStructDataHeader();
     if (mainDataHeader.version <= kVersions.last.version) {
@@ -1011,50 +1009,34 @@ class _SampleInterfaceSampleMethod1Params extends bindings.Struct {
         'Message newer than the last known version cannot be shorter than '
         'required by the last known version.');
     }
-    if (mainDataHeader.version >= 0) {
-      
-      result.in1 = decoder0.decodeInt32(8);
-    }
-    if (mainDataHeader.version >= 0) {
-      
-      result.in2 = decoder0.decodeString(16, true);
-    }
     return result;
   }
 
   void encode(bindings.Encoder encoder) {
-    var encoder0 = encoder.getStructEncoderAtOffset(kVersions.last);
-    
-    encoder0.encodeInt32(in1, 8);
-    
-    encoder0.encodeString(in2, 16, true);
+    encoder.getStructEncoderAtOffset(kVersions.last);
   }
 
   String toString() {
-    return "_SampleInterfaceSampleMethod1Params("
-           "in1: $in1" ", "
-           "in2: $in2" ")";
+    return "_SampleInterfaceSampleMethod0Params("")";
   }
 
   Map toJson() {
     Map map = new Map();
-    map["in1"] = in1;
-    map["in2"] = in2;
     return map;
   }
 }
 
 
-class SampleInterfaceSampleMethod1ResponseParams extends bindings.Struct {
+class _SampleInterfaceSampleMethod1Params extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
     const bindings.StructDataHeader(24, 0)
   ];
-  String out1 = null;
-  Enum out2 = null;
+  int in1 = 0;
+  String in2 = null;
 
-  SampleInterfaceSampleMethod1ResponseParams() : super(kVersions.last.size);
+  _SampleInterfaceSampleMethod1Params() : super(kVersions.last.size);
 
-  static SampleInterfaceSampleMethod1ResponseParams deserialize(bindings.Message message) {
+  static _SampleInterfaceSampleMethod1Params deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
@@ -1063,11 +1045,11 @@ class SampleInterfaceSampleMethod1ResponseParams extends bindings.Struct {
     return result;
   }
 
-  static SampleInterfaceSampleMethod1ResponseParams decode(bindings.Decoder decoder0) {
+  static _SampleInterfaceSampleMethod1Params decode(bindings.Decoder decoder0) {
     if (decoder0 == null) {
       return null;
     }
-    SampleInterfaceSampleMethod1ResponseParams result = new SampleInterfaceSampleMethod1ResponseParams();
+    _SampleInterfaceSampleMethod1Params result = new _SampleInterfaceSampleMethod1Params();
 
     var mainDataHeader = decoder0.decodeStructDataHeader();
     if (mainDataHeader.version <= kVersions.last.version) {
@@ -1089,15 +1071,11 @@ class SampleInterfaceSampleMethod1ResponseParams extends bindings.Struct {
     }
     if (mainDataHeader.version >= 0) {
       
-      result.out1 = decoder0.decodeString(8, true);
+      result.in1 = decoder0.decodeInt32(8);
     }
     if (mainDataHeader.version >= 0) {
       
-        result.out2 = Enum.decode(decoder0, 16);
-        if (result.out2 == null) {
-          throw new bindings.MojoCodecError(
-            'Trying to decode null union for non-nullable Enum.');
-        }
+      result.in2 = decoder0.decodeString(16, true);
     }
     return result;
   }
@@ -1105,34 +1083,36 @@ class SampleInterfaceSampleMethod1ResponseParams extends bindings.Struct {
   void encode(bindings.Encoder encoder) {
     var encoder0 = encoder.getStructEncoderAtOffset(kVersions.last);
     
-    encoder0.encodeString(out1, 8, true);
+    encoder0.encodeInt32(in1, 8);
     
-    encoder0.encodeEnum(out2, 16);
+    encoder0.encodeString(in2, 16, true);
   }
 
   String toString() {
-    return "SampleInterfaceSampleMethod1ResponseParams("
-           "out1: $out1" ", "
-           "out2: $out2" ")";
+    return "_SampleInterfaceSampleMethod1Params("
+           "in1: $in1" ", "
+           "in2: $in2" ")";
   }
 
   Map toJson() {
     Map map = new Map();
-    map["out1"] = out1;
-    map["out2"] = out2;
+    map["in1"] = in1;
+    map["in2"] = in2;
     return map;
   }
 }
 
 
-class _SampleInterfaceSampleMethod0Params extends bindings.Struct {
+class SampleInterfaceSampleMethod1ResponseParams extends bindings.Struct {
   static const List<bindings.StructDataHeader> kVersions = const [
-    const bindings.StructDataHeader(8, 0)
+    const bindings.StructDataHeader(24, 0)
   ];
+  String out1 = null;
+  Enum out2 = null;
 
-  _SampleInterfaceSampleMethod0Params() : super(kVersions.last.size);
+  SampleInterfaceSampleMethod1ResponseParams() : super(kVersions.last.size);
 
-  static _SampleInterfaceSampleMethod0Params deserialize(bindings.Message message) {
+  static SampleInterfaceSampleMethod1ResponseParams deserialize(bindings.Message message) {
     var decoder = new bindings.Decoder(message);
     var result = decode(decoder);
     if (decoder.excessHandles != null) {
@@ -1141,11 +1121,11 @@ class _SampleInterfaceSampleMethod0Params extends bindings.Struct {
     return result;
   }
 
-  static _SampleInterfaceSampleMethod0Params decode(bindings.Decoder decoder0) {
+  static SampleInterfaceSampleMethod1ResponseParams decode(bindings.Decoder decoder0) {
     if (decoder0 == null) {
       return null;
     }
-    _SampleInterfaceSampleMethod0Params result = new _SampleInterfaceSampleMethod0Params();
+    SampleInterfaceSampleMethod1ResponseParams result = new SampleInterfaceSampleMethod1ResponseParams();
 
     var mainDataHeader = decoder0.decodeStructDataHeader();
     if (mainDataHeader.version <= kVersions.last.version) {
@@ -1165,19 +1145,39 @@ class _SampleInterfaceSampleMethod0Params extends bindings.Struct {
         'Message newer than the last known version cannot be shorter than '
         'required by the last known version.');
     }
+    if (mainDataHeader.version >= 0) {
+      
+      result.out1 = decoder0.decodeString(8, true);
+    }
+    if (mainDataHeader.version >= 0) {
+      
+        result.out2 = Enum.decode(decoder0, 16);
+        if (result.out2 == null) {
+          throw new bindings.MojoCodecError(
+            'Trying to decode null union for non-nullable Enum.');
+        }
+    }
     return result;
   }
 
   void encode(bindings.Encoder encoder) {
-    encoder.getStructEncoderAtOffset(kVersions.last);
+    var encoder0 = encoder.getStructEncoderAtOffset(kVersions.last);
+    
+    encoder0.encodeString(out1, 8, true);
+    
+    encoder0.encodeEnum(out2, 16);
   }
 
   String toString() {
-    return "_SampleInterfaceSampleMethod0Params("")";
+    return "SampleInterfaceSampleMethod1ResponseParams("
+           "out1: $out1" ", "
+           "out2: $out2" ")";
   }
 
   Map toJson() {
     Map map = new Map();
+    map["out1"] = out1;
+    map["out2"] = out2;
     return map;
   }
 }
@@ -1911,14 +1911,14 @@ class IntegerAccessorStub extends bindings.Stub {
   int get version => 3;
 }
 
-const int _SampleInterface_sampleMethod1Name = 1;
 const int _SampleInterface_sampleMethod0Name = 0;
+const int _SampleInterface_sampleMethod1Name = 1;
 const int _SampleInterface_sampleMethod2Name = 2;
 
 abstract class SampleInterface {
   static const String serviceName = null;
-  dynamic sampleMethod1(int in1,String in2,[Function responseFactory = null]);
   void sampleMethod0();
+  dynamic sampleMethod1(int in1,String in2,[Function responseFactory = null]);
   void sampleMethod2();
 }
 
@@ -1978,6 +1978,14 @@ class _SampleInterfaceProxyCalls implements SampleInterface {
   _SampleInterfaceProxyImpl _proxyImpl;
 
   _SampleInterfaceProxyCalls(this._proxyImpl);
+    void sampleMethod0() {
+      if (!_proxyImpl.isBound) {
+        _proxyImpl.proxyError("The Proxy is closed.");
+        return;
+      }
+      var params = new _SampleInterfaceSampleMethod0Params();
+      _proxyImpl.sendMessage(params, _SampleInterface_sampleMethod0Name);
+    }
     dynamic sampleMethod1(int in1,String in2,[Function responseFactory = null]) {
       var params = new _SampleInterfaceSampleMethod1Params();
       params.in1 = in1;
@@ -1988,14 +1996,6 @@ class _SampleInterfaceProxyCalls implements SampleInterface {
           -1,
           bindings.MessageHeader.kMessageExpectsResponse);
     }
-    void sampleMethod0() {
-      if (!_proxyImpl.isBound) {
-        _proxyImpl.proxyError("The Proxy is closed.");
-        return;
-      }
-      var params = new _SampleInterfaceSampleMethod0Params();
-      _proxyImpl.sendMessage(params, _SampleInterface_sampleMethod0Name);
-    }
     void sampleMethod2() {
       if (!_proxyImpl.isBound) {
         _proxyImpl.proxyError("The Proxy is closed.");
@@ -2100,6 +2100,11 @@ class SampleInterfaceStub extends bindings.Stub {
     }
     assert(_impl != null);
     switch (message.header.type) {
+      case _SampleInterface_sampleMethod0Name:
+        var params = _SampleInterfaceSampleMethod0Params.deserialize(
+            message.payload);
+        _impl.sampleMethod0();
+        break;
       case _SampleInterface_sampleMethod1Name:
         var params = _SampleInterfaceSampleMethod1Params.deserialize(
             message.payload);
@@ -2122,11 +2127,6 @@ class SampleInterfaceStub extends bindings.Stub {
               bindings.MessageHeader.kMessageIsResponse);
         }
         break;
-      case _SampleInterface_sampleMethod0Name:
-        var params = _SampleInterfaceSampleMethod0Params.deserialize(
-            message.payload);
-        _impl.sampleMethod0();
-        break;
       case _SampleInterface_sampleMethod2Name:
         var params = _SampleInterfaceSampleMethod2Params.deserialize(
             message.payload);