Mojom frontend: Don't stop after processing the first method. This patch fixes a bug introduced in https://codereview.chromium.org/1833593002 but never deployed. This was a logic error that caused us to quit after processing the packing data for the first method in in an interface. In this patch we fix the bug, add a test for it, and also update the sha1 so that we are actually deploying the fix. The changes to the .mojom.dart files must be from some earlier change that was never deployed. R=vardhan@google.com Review URL: https://codereview.chromium.org/1832143003 .

commit: d100172713b0b1fd26dddab3474bb83bbb15a8db [log] [tgz]
author: Mitch Rudominer <rudominer@chromium.org> Fri Mar 25 17:57:10 2016 -0700
committer: Mitch Rudominer <rudominer@chromium.org> Fri Mar 25 17:57:10 2016 -0700
tree: 689a303b491290ff34c2e2d6cdd09809c1286c27
parent: b26cde572364fbb2d0a3fb8368fed8ab05afaa8d [diff]
diff --git a/mojo/dart/packages/_mojo_for_test_only/lib/dart_to_cpp/dart_to_cpp.mojom.dart b/mojo/dart/packages/_mojo_for_test_only/lib/dart_to_cpp/dart_to_cpp.mojom.dart
index 4be0dee..74b4847 100644
--- a/mojo/dart/packages/_mojo_for_test_only/lib/dart_to_cpp/dart_to_cpp.mojom.dart
+++ b/mojo/dart/packages/_mojo_for_test_only/lib/dart_to_cpp/dart_to_cpp.mojom.dart

@@ -1331,7 +1331,7 @@
   // serializedRuntimeTypeInfo contains the bytes of the Mojo serialization of
   // a mojom_types.RuntimeTypeInfo struct describing the Mojom types in this
   // file. The string contains the base64 encoding of the gzip-compressed bytes.
-  var serializedRuntimeTypeInfo = "H4sIAAAJbogC/9yaz2/bNhTHLcVObMdOnMTNvK3rPKDFuh+N+wuFsVOGLkOHFYOxFsV6ctSItTVYkifJQ3frn+BjjjvuuOOO+xN23NG79dhLgd06cn5yWJqUZAI03RB4oGUTFt9HXz4+kmrkpqUG9XWo2e/jusjUbLu/ob6KLY+tCdeHUB9D/Rzqy9guYnv4uHPU/fbo8Re2FUTdyO+eDIcHd4fDB46NSLsr2D4QtfsKf4aGie2OTvr+l0EvxL9/gu2jtHb3nTCCft4Df4ifa9jalN/k+vnm2bWB7eX+m9eTz6bXTYZbXF5S92HLa1zi59KmvhO1J2Ub2wa2GOH7+PMeNgHeuedIOJaxPcL2HbZW33dRKxjZvut4KGi5/o9+KwxOph/Iv7ZGnhNFKIzCFnKfINtGQZdc4sb0TUl7d/5+NBfCuf3ofuH15FUh98+rgoGN1VPbnNad/LTur5/pjv6/FwwX8r8ibuS36xz29Lhgyw62ErYHEfbxIZrphfXvY2ymQp6srl4wdZquWH/bAn/fBZ9n/l4L0E8jsd9xUeV3MffmOCsKxlcxl00f/2tOxAv/tqg+6tgqJM5gD752PCfsI5vH6dNzoo+L4DPtLy2Rt10fJB7J8ErTR8fxet+jcOh7IeJxunbO9EH7e570YSjSB0lJkvRxoEkfx6YafdD+6tQHq4tDJg8jvxeo/C2tZOWUY/TGlgrkQwOHz+UAWKrWQ06Qx9G6pVPpRfPupHFpCPJHlXl1DfoSLzlivQqWI3PP5YamvLoO65SYm0n9vkb18xQa/VrIOB9Kzg+p+TSK7g4c5Inyypua4l3HVJRPx/5qzqdXNd7F69kTWLPy9FDXEO8agvV21n2NrPGNHYcTNu+QHIdp8wvJ03g6vLXk8TdhahX599uch7J6MBXpgUzRPD63NenheE2NHoifOvXQAJ6zOGOI43EOYrKKeCz6/gK2KjZv5H6DXbAiB2fqAl1UFXJadH4qSvIwUuanTcijrKCXE42PKxrnpzhvjVPsrPvkSfHIpK7Z8fkv1H/W1eTfcRd5+TfV/bnnUIJ5WtVzOMX/uYttDPcbg3DGEJDHEK/GsG89hoE7hv3r8QbUAPy0BPl4eVr/BucMv1em9R9V4Lw1rf/aBp3vwHPZTY4b65rWraFz5zbv+ZTh+S4zXiTFT1Xx4ozDrZs8DpuaOOQT+ivDwczM4cYdHoeKJg5rgv5uSXJYyzh/hE6bO39UNXEoJ8RhGQ75jHoYCeLDFsTwZXMoCfrbkORQyMyBHx+2NXEoJuzbynBYz8yBHx9qmjhsJOxTyHDYyBgfRoL4sKOJgynob1OSQzFl3RH7+XTgW1H3Z2sg2Cfb1RQvRTwuS/IoLcTD8Z4KeOytGI+rkjzKC/HwLE/Ao66Jh5FxnZ2Vx2YKj11gZvujJwN0NmBYHhc0xQ8Rj7Ykj8piPGYDhuWxv2I8DiV5VBfjMRswLI93NPAwEvZx7kny2MqYb3iWyz2/ayg+v2N1wONiUvsrbOlIctlO0Um8LxpGgeP1ulYQWL/w+MTnWar3uQzwg92fqgnGDc0vn8Dvc0l+tRR++6A9F4Wh1UPdvuXZAzTP7z1gugx9GRJ8fpDks5PCZw/mMtuKrBkcjr7Ie6yXlsTHTNn/JLGzL3r/AAbwJOP5xCGz/9nJcD5BvyrRhHuLXqdgOV5SvA/Knl88M1bz/RkPPeOe73wIn5cRx1S+P7Mq5yMxbydCLo93E9osm/eyzkf+CwAA//+zg3pHaDEAAA==";
+  var serializedRuntimeTypeInfo = "H4sIAAAJbogC/9yaz2/bNhTHLcVObMdOnMTNvK3rPKDFuh+N+wuFsVOGLkOHFYOxFsV6ctSItTVYkifJQ3frn+BjjjvuuOOO+xN23NG79dhLgd06cn5yWJqUZAI03RB4oGUTFt9HXz4+kmrkpqUG9XWo2e/jusjUbLu/ob6KLY+tCdeHUB9D/Rzqy9guYnv4uHPU/fbo8Re2FUTdyO+eDIcHd4fDB46NSLsr2D4QtfsKf4aGie2OTvr+l0EvxL9/gu2jtHb3nTCCft4Df4ifa9jalN/k+vnm2bWB7eX+m9eTz6bXTYZbXF5S92HLa1zi59KmvhO1J2Ub2wa2GOH7+PMeNgHeuedIOJaxPcL2HbZW33dRKxjZvut4KGi5/o9+KwxOph/Iv7ZGnhNFKIzCFnKfINtGQZdc4sb0TUl7d/5+NBfCuf3ofuH15FUh98+rgoGN1VPbnNad/LTur5/pjv6/FwwX8r8ibuS36xz29Lhgyw62ErYHEfbxIZrphfXvY2ymQp6srl4wdZquWH/bAn/fBZ9n/l4L0E8jsd9xUeV3MffmOCsKxlcxl00f/2tOxAv/tqg+6tgqJM5gD752PCfsI5vH6dNzoo+L4DPtLy2Rt10fJB7J8ErTR8fxet+jcOh7IeJxunbO9EH7e570YSjSB0lJkvRxoEkfx6YafdD+6tQHq4tDJg8jvxeo/C2tZOWUY/TGlgrkQwOHz+UAWKrWQ06Qx9G6pVPpRfPupHFpCPJHlXl1DfoSLzlivQqWI3PP5YamvLoO65SYm0n9vkb18xQa/VrIOB9Kzg+p+TSK7g4c5Inyypua4l3HVJRPx/5qzqdXNd7F69kTWLPy9FDXEO8agvV21n2NrPGNHYcTNu+QHIdp8wvJ03g6vLXk8TdhahX599uch7J6MBXpgUzRPD63NenheE2NHoifOvXQAJ6zOGOI43EOYrKKeCz6/gK2KjZv5H6DXbAiB2fqAl1UFXJadH4qSvIwUuanTcijrKCXE42PKxrnpzhvjVPsrPvkSfHIpK7Z8fkv1H/W1eTfcRd5+TfV/bnnUIJ5WtVzOMX/uYttDPcbg3DGEJDHEK/GsG89hoE7hv3r8QbUAPy0BPl4eVr/BucMv1em9R9V4Lw1rf/aBp3vwHPZTY4b65rWraFz5zbv+ZTh+S4zXiTFT1Xx4ozDrZs8DpuaOOQT+ivDwczM4cYdHoeKJg5rgv5uSXJYyzh/hE6bO39UFcctEYdyQhyW4ZDPqIeRID5sQQxfNoeSoL8NSQ6FzBz48WFbE4diwr6tDIf1zBz48aGmicNGwj6FDIeNjPFhJIgPO5ripCnob1OSQzFl3RHvDz4d+FbU/dkaCPbJdleMx2VJHqWFeDjeUwGPvRXjcVWSR3khHp7lCXjUNfEwMq6zs/LYTOGxC8xsf/RkgM4GDMvjgqY4KuLRluRRWYzHbMCwPPZXjMehJI/qYjxmA4bl8Y4GHkbCPs49SR5bGfMNz3K553cNxed3rA54XExqf4UtHUku2yk6ifdFwyhwvF7XCgLrFx6f+DxL9T6XAX6w+1M1wbih+eUT+H0uya+Wwm8ftOeiMLR6qNu3PHuA5vm9B0yXoS9Dgs8Pknx2UvjswVxmW5E1g8PRF3mP9dKS+Jgp+58kdvZF7x/AAJ5kPJ84ZPY/OxnOJ+hXJZpwb9HrFCzHS4r3E9jzi2fGar4/46Fn3POdD+HzMuKYyvdnVuV8JObtRMjl8W5Cm2XzXtb5yH8BAAD//8CK6V9oMQAA";
 
   // Deserialize RuntimeTypeInfo
   var bytes = BASE64.decode(serializedRuntimeTypeInfo);

diff --git a/mojo/dart/packages/_mojo_for_test_only/lib/imported/sample_import.mojom.dart b/mojo/dart/packages/_mojo_for_test_only/lib/imported/sample_import.mojom.dart
index 225d4df..fa713e9 100644
--- a/mojo/dart/packages/_mojo_for_test_only/lib/imported/sample_import.mojom.dart
+++ b/mojo/dart/packages/_mojo_for_test_only/lib/imported/sample_import.mojom.dart

@@ -542,7 +542,7 @@
   // serializedRuntimeTypeInfo contains the bytes of the Mojo serialization of
   // a mojom_types.RuntimeTypeInfo struct describing the Mojom types in this
   // file. The string contains the base64 encoding of the gzip-compressed bytes.
-  var serializedRuntimeTypeInfo = "H4sIAAAJbogC/8yYzW7TQBCA1wmFtE1L6B/9ARpoBQFE3GPEqVWJSESFqjaHlkt/DTFqYmO7UnmDPgZHHoPH6JFH6JEbrOvZ2B7vpmsrMV5ptP5Ze3e+nZ3dmXnilRLUa1Dj56wuoBq3I4r/nxEqFXjcgNqE+hLqH1A/p/KESmt/u37wob7/Vu+YhuVop9WNruG0NWu3fWRqhLymbVa47Zpw0ew6mvX56ES7+e8ylYfc9tuG3nX6vPc6fEnfPeW+39ec8NBuyh7oXUJ6u/d5V/8R/95FdV0I82sUw/dXU/05s/8Hy19a2DyuB5659TbhlxkqbtdYpcdUZqkIpiMyrinQ/xOVHSpq2+hoqnV+anT0rmapHeOrodrWiXdhnh+f6SeqzqbMVo/17qne/WKrjmY7tmofdcwz7cDrvep+0/H6KQNP1v8F8PiVC9sxs7+yEh5nDe7HSDKOewKOD6iMurrXN1sbH99v1eH5C7BFLseq3xrznKaSS4Gn7PpjdjxG+JznFT6XcUnONUl7naRyl8pmc2fThbxKrx8J+bJWUXudyRhfWZ7FAfMsgU9v7TRvDJGNl8+TtYrynM0YzzLap3r6SvrPBuJ3KOC3AGufvwsR8ozKYpCnoCHmuQJrbdg8cb/zATtTkJ0ogf2/51+hvhbwuY0zQZzXBP+ZBl/yztilIJw21Y07/tWU7BDb1zWq4+pdE+i9BLoH9H5jad/O6ej45wMow9a/ILALvN4KhM/rD7OjfDJ/ti7gNQHnEO+UR8gc7Bno+Bfh5vqUeymtt1xwvSnhc0YNjWuEyBVZeyNo/eIyCvN5ITjnL8OcDptTXB53EvJQJHl8F/Aop8Sj3zrLcfx3KaY/iru+WBwQWV/wAo9jLKX4oAK2wPyNCRP8E+KD3/n+51c23ooSto9BxVuiOKEMcxfm6AcImOd4SvvcbXEyiwsUQVxQEpxjcwntsiEZF0TiVxQQYJ7FjPCU5ZcfMD8cB7BxIn69AADzm8g4P+Y/WT5g0PyK4He2NnZbwXMb4sdeR/hNZoQfPtdXJO2lAt8I/tsznGHns1zd7lPBWbqIf0UNeHHQ/8hnXQKPK0E+q4L2qYbi5zOScDyMuU+9gphWxLGKPsBcF1Ky87j5W7aPzcTMb80OOb8VyR9i3tAQc17MKGdRfhaXuYRc9yT9FRu3kKuf6uLa8VJG+f4LAAD//5SRSqTYGQAA";
+  var serializedRuntimeTypeInfo = "H4sIAAAJbogC/8yYzW7TThDA18m/f9I2LYF+fwApFAgg4h4jTq1KRCIqVLU5tFz6aYhRExvblcob9DE48hg8Ro88Qo/cYF3PxvZ4N11bifFKo43tjT3z29nZnZknXitBvwY9vs/6AurxOKL47xmhUoHbDehN6C+h/w79MyoPqbT2t+sH7+v7b/SOaViOdlrd6BpOW7N220emRsgrOuYJd1wTfjS7jmZ9OjrRbt77iMocd/y2oXedPs+9D76gz1a4z/c1J6zaTdsDu0vIbvc679o/4l+7qK4LYX6NYvj66n5/zuz9wfaHNjaP64F7br9N+G2aivtpbNIDKjNUBNMR0WsK7P9IZYeK2jY6mmqdnxodvatZasf4Yqi2deL9MM+Pz/QTVWdTZqvHevdU7362VUezHVu1jzrmmXbgfb3q/qfjfacMPNn3L4DHz1zYj5n/lZWwnjW4HiPJOO4JON6jMuraXt9sbXx4t1WH+8/BF7kcq/5ozNOdl1wKPGXXH/PjMcLnPK/wuYxLcq5J+usklf+pbDZ3Nl3Iq/T3spAvGxX115mM8ZXlWRwwzxLE9NZO88YRmb58nmxUlOdsxniW0T7Vs1cyfjYQv0MBvwVY+/xdiJDHVBaDPAUDMc9VWGvD5om/Ox/wMwX5iRLY/3vxFfprAZ/bOBPEeU3wnimIJW+NXQrCaVPbuPo/TckPsX9doz6u3TWB3Utge8Du15b29Zxqxz8fQBu2/QWBX+D1ViB8Xr+ZH+WTxbN1Aa8JOId4pzwvLk0G1x88wNzcPfpOSustF1xvSvicUUN6jRC5JutvBK1f3EZhPi8E5/wyzOmwOcXl8V9CHookj28CHisp8ei3znKc+F2KGY/iri+WB0TWFzzAeoynlB9UwBdYvDFhgn9AfvAr3//8yvStKGH/GFS+JcoTyjB3YY5+goB5FlPa527Lk1leoAjygpLgHJtL6JcNybwgkr+ihADznMgIT1l++QHzw3kA0xPx6yUAmN9kxvmx+MnqAYPmV4S4s7Wx2wqe2xA/9jjC725G+OFzfUXSXyrwH8F7e44z7HrWHLDEVbpIfEUDsF4L/6iedQk8rgT1rArapxqKXy9KwvEw5j71EnJaEccq+gPmupiSn8et37J9bDpmfWtmyPWtSP0Q84aBmPNSRjmL6rO4zSbkuicZr5jeQq5+qYvrx8sZ5fs3AAD//2TQyaPYGQAA";
 
   // Deserialize RuntimeTypeInfo
   var bytes = BASE64.decode(serializedRuntimeTypeInfo);

diff --git a/mojo/dart/packages/_mojo_for_test_only/lib/imported/sample_import2.mojom.dart b/mojo/dart/packages/_mojo_for_test_only/lib/imported/sample_import2.mojom.dart
index 209e2e2..edfd92f 100644
--- a/mojo/dart/packages/_mojo_for_test_only/lib/imported/sample_import2.mojom.dart
+++ b/mojo/dart/packages/_mojo_for_test_only/lib/imported/sample_import2.mojom.dart

@@ -288,7 +288,7 @@
   // serializedRuntimeTypeInfo contains the bytes of the Mojo serialization of
   // a mojom_types.RuntimeTypeInfo struct describing the Mojom types in this
   // file. The string contains the base64 encoding of the gzip-compressed bytes.
-  var serializedRuntimeTypeInfo = "H4sIAAAJbogC/8yXzW7TQBCA101DgqBVaKENFT/hgBQuMeIUcUoJEZFaoYrkUnGoUsfUi2JvZLtC4gl4BB6DR+FROHKDcTwbuWNvNolqtyONNvaud3e+2ZnZ1FksNWxfY0vfy7ZKWjruB7YN0FKiX87bx/Y56D7o8PSkd3bUO33L3anwQ3vc6oqJ8Nkz6NvL7B/w7/ai74cO9y5YG9eX+2om9mmA/ipdfa5Wsu35Q/adlH8g0q524l3Udli2bIGWQWMrYxu3QYn5qX3cx+8+gw5ATUe4tulfjoXLPds3XfFVmIFvxT+ml+cTbpncC23/y8iyA/Oce2PgEpihHYSBGYzc6cQ+i1d904o+cuf2byTW7RtX/TfnaLCFsiqvvmKee+jHT733s+cD0J0Ur5bsTnHbQnvy5qY7z8vyM66Znzxv744Pu0fQPgF9mOYnu1P8tm8JvwbJN38lz9L1xmcUZ5uRrbMsw9gjZEjST4rTA9DKDcRnHQ9Mh9gp+8tsOdHxo9LUnLdvfBw6GZx2sHbkzWlVHptr8jA0PKL4uQPq2PzCCdM8dgviMa9zJI4YOU+qOPtZyacOxtU6ow5iB+W1V1CcNfFMNJKQQH5jvmmW1XFXTnCT++4YxcRd4IymWflpH3NU3twaZF/0XKX8PIg3rM7/8QB6fptkXhWvyOa7s/tDd3j48cNxD9+/An2hXq9Fxy/r57aRbz6Rfrbw/kj9XC8on6j8XFfcc3X1fV3/7uIdkVxj2EvQp+r15iN1fqVSXdOvGxq/1nDuibBGIRce9evjW+bXEwGTL/RrPGJVvrU1+ZY0fOW9LsB7HeV7UFBd0fGl90/d/+BFdT1Zv/4HAAD//+V0OKDoDwAA";
+  var serializedRuntimeTypeInfo = "H4sIAAAJbogC/8yXzW7TQBCA101DgoASaKGh/IUDkrnEiFPEKSVERGqFKpJLxaFKHVMvir2R7QqJJ+AReAwehUfhyA3G8Wzkjr3ZJGrcjjTa2Lve3flmdmZTZ4nUsH2NLX0v2ypp6bgf2DZAS6l+OW8P2+egu6CD46PuyUH3+C33JiKInFGzI8YiYM+g72Fuf59/d+Z9P3C5f8ZauL7cl5napwH6q3TxuVrJt+cP2Xda/oFIu1qpd3HbZvlyB7QMmliZ2LgFSszP7EN+9xm0D2q5wnOs4HwkPO47geWJr8IKAzv5MTk/HXPb4n7kBF+GthNap9wfAZfQipwwCq1w6E3Gzkmy6ptm/JE3s38jtW7PuOi/GUeDzZVlefUU89xCP37qvp8+74Hez/Bqyu4Mty20Z93cdPG8KD/jkvnJuHl3uN85gPYJ6E6Wn+zO8Lt7Tfg1SL75K3mWLvd83gbdjG2dZhnGHiBDkn4ynOKYrFzB+axjwLSJnbK/zBYTHT8qpibevvFR5OZw2sbasW5Oy/LYXJGHoeER558boK7Dz9woy2OnIB6zOkfOESPxpDpnPyvrqYNJtc6pg9hBee0WdM5MjIlGGhLIb8w3Zll97sopbnLfbaOYcxe6w0lefoqf7xXArUH2ReMq4+d+smF1/k8G0Pg1ybwqXrHNN6f3h85g/+OHwy6+fwX6Qr1ek45f1M8tY735RPrZxvsj9fOjgvKJys91xT1XV99X9e823hHJNYa9BH2qXm82UudXKtUV/bqh8WsN5x4Lexhx4VO/7l0zvx4JmHyuX5MRy/Ktrci3pOEr73Uh3uso38cF1RUdX3r/1P0PnlfX0/XrfwAAAP//FZeVoOgPAAA=";
 
   // Deserialize RuntimeTypeInfo
   var bytes = BASE64.decode(serializedRuntimeTypeInfo);

diff --git a/mojo/dart/packages/_mojo_for_test_only/lib/math/math_calculator.mojom.dart b/mojo/dart/packages/_mojo_for_test_only/lib/math/math_calculator.mojom.dart
index b2d603f..fa68da9 100644
--- a/mojo/dart/packages/_mojo_for_test_only/lib/math/math_calculator.mojom.dart
+++ b/mojo/dart/packages/_mojo_for_test_only/lib/math/math_calculator.mojom.dart

@@ -790,7 +790,7 @@
   // serializedRuntimeTypeInfo contains the bytes of the Mojo serialization of
   // a mojom_types.RuntimeTypeInfo struct describing the Mojom types in this
   // file. The string contains the base64 encoding of the gzip-compressed bytes.
-  var serializedRuntimeTypeInfo = "H4sIAAAJbogC/+xXS0/qQBSGcm8ucH3gE9yRuGEjw5K4whgSE2Piwg2JCSntKDV92YeJ/9YlS5fudGrPwDDMCDQgaHqSkwNlpnO+j/N9hUomjhLUBlT+Oq15rvLrmsz7LLOuCmtvOtft7mW7c2qpQb9+rppaaKqB41VgfbQvx+1jz6HxBvUiMxnvJCiOFnNNtj6KXZJFkqOO4utlktskuXYncP+D/bcRRpKo71gYeaHuWIaNPWQ5Dw7yPS1+4YY909CQYQfYu1M17KOeYeuGfe+jAPuBj6LjutrwuHq0yxLxTfnZB94ywKPCfJ5j9rl/4vpSiGuNu8+Afr/KOD8y3hoC7tn78rFJ8m/Es4lVT4AnD70vm0d+rgZcnTZXPN6GBO8BYP7Ee+Lhx5D0JcBNY9m48xJ98vqS6Y/yQwdsUTwdktxiePJdx/bx6nji+WkJ/I1qbZaYVT80punnSTVDLNFPeQX8sPOTZfqR+Us1N86fiJ9sAn/5D353puvC51Nhxf6yaN3sAWaCl3GXVDfz6qYAz/l10c13zU/0u2FjOD/UddP5STI/xz/Id5Uv+FES+G4JeroKzcBwzWeen+Iv890KYKN4qfmmuplPN0XwoHX13Vfu/9C889OU8HJEcmd8fkbmm/pvojmqrdEcfQQAAP//A2SLr1gRAAA=";
+  var serializedRuntimeTypeInfo = "H4sIAAAJbogC/+xXS0/qQBiFcm/C417FJ7gjccNGhiVxhTEkJsbEhRsSE1LaUWr6sg8T/61Lli7d6dR+A8MwI9CAoOmXfPm0zLRzTs45hWomrjLMJkz+Op15bvLrWsz/WWZdDdbedK87vctO99RSg0HjXDW10FQDx6vC+mhfjtvHPofWG8yLzHS9k6I42sw12fqodkkXSY9PFF+vkN4mzR13Cnce9t9GGEmjgWNh5IW6Yxk29pDlPDjI97T4Dzfsm4aGDDvA3p2qYR/1DVs37HsfBdgPfBQ9rqeNHteIdlkivik/+8BbBnhUmM9zzD73TzxfCvGsc/cZUjzKJD8y3poC7tn78vWf9N+IZxOrngBPAc6+ah55XQ25OUtXPN6mBO8BYP7Ee+Lhx5CcS4Cb1qpx5yX+5P0l8x/lhwpsWTwdkt5iePJdx/bx+nji+WkL8o16bZ6a1z+0ZvnnSTVDLPFPZQ38sPrJMueR5UstN8mfiJ9sgnwpQd6d6brw/VRcc74s2zd7gJngZdIl9c2ivinCe35TfPNd+om+N/wb6YembqqfJPo5/kG5q3zBj5Igd8twpqvQDAzXfOb5Kf2y3K0CNoqXhm/qm8V8U4IM2tTcfeV+Dy2qn5aElyPSO5P6GYdvmr+JdFTfIB19BAAA///PwtgdWBEAAA==";
 
   // Deserialize RuntimeTypeInfo
   var bytes = BASE64.decode(serializedRuntimeTypeInfo);

diff --git a/mojo/dart/packages/_mojo_for_test_only/lib/mojo/examples/echo.mojom.dart b/mojo/dart/packages/_mojo_for_test_only/lib/mojo/examples/echo.mojom.dart
index 4153ab1..7092573 100644
--- a/mojo/dart/packages/_mojo_for_test_only/lib/mojo/examples/echo.mojom.dart
+++ b/mojo/dart/packages/_mojo_for_test_only/lib/mojo/examples/echo.mojom.dart

@@ -406,7 +406,7 @@
   // serializedRuntimeTypeInfo contains the bytes of the Mojo serialization of
   // a mojom_types.RuntimeTypeInfo struct describing the Mojom types in this
   // file. The string contains the base64 encoding of the gzip-compressed bytes.
-  var serializedRuntimeTypeInfo = "H4sIAAAJbogC/5JggAABKL0CSqOLWyDxGYGYA8qXAWIRIM7Nz8q3skqtSMwtyEkttrJyTc7Ix6Ye3VwDKK0MxNJAHBIZ4Brv7RppBTJQD2aeHsw4nOY44HAfseZKQPWB9DMj6VdAs8+DEUInQGkPNPtB4D8QzICyFyCJgegNDNgBursVsPiTHUlcGIi5gTg4tagsMznVLzE3laj44AFiFiCG8aWAWAiqHkuwYIQzyH1cQGwJxIZArJ+Rn5uqX1Sakp+bmZdapA8yR7+4KFkfZpZ+KtAsMKEHksslMt2g2wvj80DDCVe4aaCF3wUo/YAJNbw9sMQBKI4MsIghp1N0IAQND5C7g0uKMvPSsYcbJxAzUSHc0NMFzH83GMnzlwUOf8HSBcJfukWphaWpxSXY/QcDlPoPPT4dcJQ/NxiIA8SGBwNa+kEHvEDMCsRliTmlqTjiV5RK/mdASuO4yk8GpPKKnulCGlr2oKSL4oL8vOLU0XSBI11oDGC6AAQAAP//tx4CJeAHAAA=";
+  var serializedRuntimeTypeInfo = "H4sIAAAJbogC/5JggAABKL0CSqOLWyDxGYGYA8qXAWIRIM7Nz8q3skqtSMwtyEkttrJyTc7Ix6Ye3VwDKK0MxNJAHBIZ4Brv7RppBTJQD2aeHsw4nOY44HAfseZKQPWB9DMj6VdAs8+DEUInQGkPNPtB4D8QzICyFyCJgegNDNgBursVsPiTHUlcGIi5gTg4tagsMznVLzE3laj44AFiFiCG8aWAWAiqHkuwYIQzJxBzAbElEBsCsX5Gfm6qflFpSn5uZl5qkT7IHP3iomR9mFn6qUCzwIQeSC6XyHSDbi+MzwMNJ1zhpoEWfheg9AMm1PD2wBIHoDgywCKGnE7RgRA0PEDuDi4pysxLxx5uIDVMVAg39HQB898NRvL8ZYHDX7B0gfCXblFqYWlqcQl2/8EApf5Dj08HHOXPDQbiALHhwYCWftABLxCzAnFZYk5pKo74FaWS/xmQ0jiu8pMBqbyiZ7qQhpY9KOmiuCA/rzh1NF3gSBcaA5guAAEAAP//asaJYeAHAAA=";
 
   // Deserialize RuntimeTypeInfo
   var bytes = BASE64.decode(serializedRuntimeTypeInfo);

diff --git a/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/rect.mojom.dart b/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/rect.mojom.dart
index 8f30c4b..f39ffdb 100644
--- a/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/rect.mojom.dart
+++ b/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/rect.mojom.dart

@@ -139,7 +139,7 @@
   // serializedRuntimeTypeInfo contains the bytes of the Mojo serialization of
   // a mojom_types.RuntimeTypeInfo struct describing the Mojom types in this
   // file. The string contains the base64 encoding of the gzip-compressed bytes.
-  var serializedRuntimeTypeInfo = "H4sIAAAJbogC/5JggAABKG0ApdHFYTQHGo2uzgKJz4ikTh6IxYE4JDLANd7bNdIqNz8rX68ktbhELyg1uQRsDiMWfQpo9nyAuZMVQnswYIL/QGCA5h6QGIh2YMAOeICYBYjBjgECMSDmA2I0Z2L4lx2KA4HYE4j1M/JzU/WLSlPyczPzUov0Qfr1i4uSIYyC0qSczGT9zLyS1KK0xOTUYv2kzLyUzLz0Yn2QHcX6RUBL9EBKc6Hma0DdBQsHBUYozQSlmSG0A5bwBwFWBuIAoXBEBxo4xDmh8VeBI31wQDGtwovUcGAhMxwYiQyHShzhwDnIwoGDzHBgIhAOvFA7yzNTSjKwhAPXIAsHHjLDgZlAOIDKEjYgzkjNTM/AUo5w0zgc0MtVCbQ8AOMDAgAA///b2cZYEAYAAA==";
+  var serializedRuntimeTypeInfo = "H4sIAAAJbogC/5JggAABKG0ApdHFYTQHGo2uzgKJz4ikTh6IxYE4JDLANd7bNdIqNz8rX68ktbhELyg1uQRsDiMWfQpo9nyAuZMVQnswYIL/QGCA5h6QGIh2YMAOeICYBYjBjgECMSDmA2I0Z2L4F+ROdiAOBGJPINbPyM9N1S8qTcnPzcxLLdIH6dcvLkqGMApKk3Iyk/Uz80pSi9ISk1OL9ZMy81Iy89KL9UF2FOsXAS3RAynNhZqvAXUXLBwUGKE0E5RmhtAOWMIfBFgZiAOEwhEdaOAQ54TGXwWO9MEJDTNahRep4cBCZjgwEhkOlTjCgWuQhQMHmeHARCAceKF2lmemlGRgCQfuQRYOPGSGAzOBcACVJWxAnJGamZ6BpRzhoXE4oJerEmh5AMYHBAAA//8bWnY5EAYAAA==";
 
   // Deserialize RuntimeTypeInfo
   var bytes = BASE64.decode(serializedRuntimeTypeInfo);

diff --git a/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/serialization_test_structs.mojom.dart b/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/serialization_test_structs.mojom.dart
index 4dcdca6..4168607 100644
--- a/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/serialization_test_structs.mojom.dart
+++ b/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/serialization_test_structs.mojom.dart

@@ -588,7 +588,7 @@
   // serializedRuntimeTypeInfo contains the bytes of the Mojo serialization of
   // a mojom_types.RuntimeTypeInfo struct describing the Mojom types in this
   // file. The string contains the base64 encoding of the gzip-compressed bytes.
-  var serializedRuntimeTypeInfo = "H4sIAAAJbogC/+yYzW7TQBDH67RVTClKEEiEDwlTOOSAYpovRZx6qVQJCZDgQE/GSdxmkWNXXkeqOPEYHDnyCBx5jB55jN5gF8+i9cbTmgR/RHSk0WRWo3j83593126sRVaH+AyiOi6irkS1bqJFcY95lfkAxt9BPIX4GeI3iGcQzyHuML/H/O3h633rxf7h86n/wW+FDg1bb8JgNgp3U9a1U9Z1UtZ1U9b1Utb1o7qnzJ9cVPfq6OXMde2h61ChYxV055JPpHng+fdKPG9uxvOzajz/uhXPT2/E8x+1KDeUeddhvptwvYO1efvJTHA1kMawem41uD8x2XfZ75vMEQzmOKyCHzO3mJsTf+qYwWzsT4nnBCb/H5MGo+jHyWzokpFJvNAJjuyRQ80h8cbEO6YmvxY1qRMQ2yUf7ZD4nsXHLPr7+rTF/2D6RyfxXOwp9yv3lcYu01G1JjJ+DfoiiE46eFE6NaReNakvjLNBppy1Uc7aiH7XS8jZhhAzR864Dut8HRq7iTptA4t56iTbstx9ypS7DspdB+GuVkLuNgvgrg49Rd1au0nnlq0cdTIS+pPnT93X0p5zluX3S6b8dlF+uwi/t0rIb6UAfrdhvR7boZ2k023QtQh++f2I51pX+Pq/+O6hfPcQvu9c8R3j+8QmQZJODWC8CL4r0r5Vdr6zPff2Ub77CN/3S8i3VuC5l3WbqNODFT33GqDj+UY6vQ4U7t4jegnOEj9qMHsMbF3y+WNO54c582jAvIs+Bso+tCrvZUbO5+O6xN4i7xH6gjppS75HPAIt896ntH+8D/3tullfUO/KkuvmTsFcXrRurkvr5a8AAAD//6YwlwxAFwAA";
+  var serializedRuntimeTypeInfo = "H4sIAAAJbogC/+yYzW7TQBDH47RV3NKqQQIp5UMyLYccUJbmSxGnXipVQgIkONCTcRK3WeTYldeRKk48BkeOPAJHHqNHHqM32MWzaL31hiXBHxUdaTTZ1dQe//fn2XUbldjqEJ9ClOd5NKUo502MOB5Qr1EfwPxbiOcQP0H8CvEC4iXEXer3qL85fnVoPz88fjYN3getyCVR63UUzkbRvmZeWzOvo5nX1czraeb147wn1B/Py3t58mLmec7QcwnXsQa6M8knwjqw8bdqctxcS44vasnxl43k+HwrOf6+HY8tad1NWO8m3O+octV+UONcDYQ5VT6zbXg+vtg79Pdt6goMrnBowt+fUrepo0kwdVE4GwdT7LshYtdBJBzFP85mQw+PEPYjNzxxRi5BQ+yPsX9KELsXQcQNsePhD06EA99mczb5dX/SYheY/taJvxcH0vPyumoVPfuTjrI1FfPrUBdW6LQONRelU0Oo1RDqUnE2yJSztpKztkK/zRJytsrFzJGzW9RXWB8ae6k6bQFreeok2rLcfcyUu46Su86c/bhs3K0VwF0daoqrtfdlnZimGznqZKXUJ66fvK/pnnOW5fdzpvx2lfx2FfzeKSG/1QL43YR+PXYiJ02nu6BrEfyy5+HvtSnx9X/x3VPy3VPw3bjhO8H3mYPDNJ12oBcUwXdV2LfKzne2596+ku++gu8HJeTbKPDcS6tN1enhNT33WqDj5aqeXkcSd+8UenHOUv+pQW2P+v0UDuVMWWcrZx4tWHdex0Dah67Ld9mjnM/HdYG9Rb4jzAV1Mpb8jtgFLfPep4x/vA/9bd+sL6h3dcm+uVcwl/P65orQL38GAAD//+ZT6wRAFwAA";
 
   // Deserialize RuntimeTypeInfo
   var bytes = BASE64.decode(serializedRuntimeTypeInfo);

diff --git a/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/test_enums.mojom.dart b/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/test_enums.mojom.dart
index 50939fd..6134d07 100644
--- a/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/test_enums.mojom.dart
+++ b/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/test_enums.mojom.dart

@@ -91,7 +91,7 @@
   // serializedRuntimeTypeInfo contains the bytes of the Mojo serialization of
   // a mojom_types.RuntimeTypeInfo struct describing the Mojom types in this
   // file. The string contains the base64 encoding of the gzip-compressed bytes.
-  var serializedRuntimeTypeInfo = "H4sIAAAJbogC/5JggAABKG0ApdHFYTQHGo2uzgGJz4ikThmIpYE4JDLANd7bNdIqNz8rX68ktbhELwRIuOaV5sLNY8RiH7o9H6C0BwMm+A8EMH9YIInhUg8zF2QXzDFSQLYQEONwJoZ7mIGYFYjDgdgfiPUz8nNT9YtKU/JzM/NSi/RB5ugXFyVDGAWlSTmZyfqZeSWpRWmJyanF+kmZeSmZeenF+iC7IGR8KtC2Yj2QhlwGDaCZLECsALUvgxFCb2CC0D+YUeNPAxZ+jKjuVGBE9Te1wo8H6r4Q1+AQEF8eiMWxhp8eWAl6+IH0MtEw/IhNfwLQuGRgIC08GakcnpxQM8OgfBkgFsEenmHY0iMLNE4GS3gykhieTFQOT26oO9z8/cF8OSAWwx6eYCXYwlN4EIUnE4nhyUyj8HRyDCIUnmAl2MJTZhCFJyx8AAEAAP//NXnBphAHAAA=";
+  var serializedRuntimeTypeInfo = "H4sIAAAJbogC/5JggAABKG0ApdHFYTQHGo2uzgGJz4ikThmIpYE4JDLANd7bNdIqNz8rX68ktbhELwRIuOaV5sLNY8RiH7o9H6C0BwMm+A8EMH9YIInhUg8zF2QXzDFSQLYQEONwJoZ7mIGYFYjDgdgfiPUz8nNT9YtKU/JzM/NSi/RB5ugXFyVDGAWlSTmZyfqZeSWpRWmJyanF+kmZeSmZeenF+iC7IGR8KtC2Yj2QhlwGDaCZLECsALUvgxFCb2CC0D+YUeNPAxZ+jKjuVGBE9Te1wo8H6r4Q1+AQEF8eiMWxhp8eWAl6+IH0MtEw/IhNfwLQuGRgIC08GakcnpxQM8OgfBkgFsEenmHY0iPrIAtPRhLDk4nK4ckNdYebvz+YLwfEYtjDE6wEPTzZBll4MpEYnsw0Ck8nxyBC4QlWgh6e7IMsPGHhAwgAAP//ez9ctxAHAAA=";
 
   // Deserialize RuntimeTypeInfo
   var bytes = BASE64.decode(serializedRuntimeTypeInfo);

diff --git a/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/test_structs.mojom.dart b/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/test_structs.mojom.dart
index 853721c..76dedd8 100644
--- a/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/test_structs.mojom.dart
+++ b/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/test_structs.mojom.dart

@@ -6234,7 +6234,7 @@
   // serializedRuntimeTypeInfo contains the bytes of the Mojo serialization of
   // a mojom_types.RuntimeTypeInfo struct describing the Mojom types in this
   // file. The string contains the base64 encoding of the gzip-compressed bytes.
-  var serializedRuntimeTypeInfo = "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";
+  var serializedRuntimeTypeInfo = "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";
 
   // Deserialize RuntimeTypeInfo
   var bytes = BASE64.decode(serializedRuntimeTypeInfo);

diff --git a/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/test_unions.mojom.dart b/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/test_unions.mojom.dart
index d729230..413a617 100644
--- a/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/test_unions.mojom.dart
+++ b/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/test_unions.mojom.dart

@@ -3441,7 +3441,7 @@
   // serializedRuntimeTypeInfo contains the bytes of the Mojo serialization of
   // a mojom_types.RuntimeTypeInfo struct describing the Mojom types in this
   // file. The string contains the base64 encoding of the gzip-compressed bytes.
-  var serializedRuntimeTypeInfo = "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";
+  var serializedRuntimeTypeInfo = "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";
 
   // Deserialize RuntimeTypeInfo
   var bytes = BASE64.decode(serializedRuntimeTypeInfo);

diff --git a/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/validation_test_interfaces.mojom.dart b/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/validation_test_interfaces.mojom.dart
index 1636779..fd7db41 100644
--- a/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/validation_test_interfaces.mojom.dart
+++ b/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/validation_test_interfaces.mojom.dart

@@ -4498,7 +4498,7 @@
   // serializedRuntimeTypeInfo contains the bytes of the Mojo serialization of
   // a mojom_types.RuntimeTypeInfo struct describing the Mojom types in this
   // file. The string contains the base64 encoding of the gzip-compressed bytes.
-  var serializedRuntimeTypeInfo = "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";
+  var serializedRuntimeTypeInfo = "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";
 
   // Deserialize RuntimeTypeInfo
   var bytes = BASE64.decode(serializedRuntimeTypeInfo);

diff --git a/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/versioning/versioning_test_client.mojom.dart b/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/versioning/versioning_test_client.mojom.dart
index ddf535e..9e3b8ba 100644
--- a/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/versioning/versioning_test_client.mojom.dart
+++ b/mojo/dart/packages/_mojo_for_test_only/lib/mojo/test/versioning/versioning_test_client.mojom.dart

@@ -1200,7 +1200,7 @@
   // serializedRuntimeTypeInfo contains the bytes of the Mojo serialization of
   // a mojom_types.RuntimeTypeInfo struct describing the Mojom types in this
   // file. The string contains the base64 encoding of the gzip-compressed bytes.
-  var serializedRuntimeTypeInfo = "H4sIAAAJbogC/+xaT4/bRBS3vYFNt1Rd+i+Gwq5ZBESFxhEIKUovWWmDgigosKii4hB5nSkxWtvBdlbbW48c+Rgc+zH4CBx75MhxbzDTvKmd8YztOI6dlTrS0zTO1DPvN+/93m9mo0rztgv939Czz4eRzzK2Onz+Ett9bLb7q9vtBsgPut0z5PmW61jOL93uYGYbzg/Id2eeiY6MwDgxfMR5DzvfAPoH2L7A9uPjYX/0Tf9xl0zUIvO0wmlaolnE7/8Leg3bVuT7HvQT6NvYmqnzH6Gp4QU2coIWHvtx6vi+PT11nyK0un8dWD/1q8nsk1YLP5Nxgyt8PHblRdyj7T/c2gw+5Bnpf5L47Qa2HWwhMvPnn2Dbh3hJgDG2vqvY3sBmYvsZmz5xbaR7s7FrWw7ydPI+3ffM+T+ms5NTy9QtJ0DeE8NEvn5iOWM8ha+TOX09nHREHozMU4tsHvnP9it8lMj8UzmMhyjOTVlKbGl4djLieQ38Pz582D+GnPsoHccWHc/i+Rb4Vxaey+ZRVpzlgnG+Cnly1H/08vOn2D7MgDMdz+J8bcNx1lh+BEAvavlwHQpw3QUupsxHYvd9Ea4hPcZ5Ctt2iXiy9aEN+AyVRT7sMOvckbK1NHzZJnp+E2IXAXQja8yNx7exXSkRPx4+cjRxmVbPiY/M8AXbCN+RkHYMG/FwuVEyLrvM+ng4Eb6vy+J8yoOTkhJHtG6PmbrN4nUTuK3MPOT5r6XojWX5UKRLJeABjZmXfv8c9ukFo6N6zH48Z/Qn5c1/E3gzuh6No2e3I88pDxwj78wy0XcQ7rl1OuHo28QfwfefY7sn4nGxbI3FUwP2r6x4youHKog/FfiFcpEC8dKE53Rc+815//t1iJc7i7xFx11A/+dWvjyncZVWLw7H40i1jfunlqxf2PimOJwr+fzvCPy/CxhE/L/vod9meFFcHGgrsz5E815UHyR5PTqjmaLjqM7gxUtjA+qCKtCdy57Pk+qBLOCBaNyqBcfte9huxeLWn7qOjy5L3C7Tiorb61An/ZmJ3fK5PHevQpxEcSWqCy9qy51/s9aF26Drvp8h72nCOezdDakLf2wVm19U7yz4H6kMVecXey+lydWcQ0V5tgPrg+MnN24aFZ8/k1pdcK/E6vhzwfnz2Qo6fivyHnqe+dZyHs19XIxPDwWehc7Q6An2HXmjqWc5gQBvvcr4TOE3ldHMako9rdeKzfc9bHc4+U4r6qbl+zP5cunBu6BXyq4T8pr0IA93sj9DeT18cr5mPrkFd2MMjUi8fXxQ0T4SfOg6tplz6ao8w+qrAQD2T23xvizrvlG+WXcdeAfucg+DwDAnX73cvSHdPM7+7VWs16hDk5x6rSfA8wPAIobDwmn+tW5bVbftAQdUqduUhPvwVf9uIMIrKz8SfD6r6N6Dx49J58sknUUB0ZRi8/QAtCgvT8Pbi9f3F3nvL/ZhzKbfX/QgvqZK+DeVPPV1VV2kpNTXBuD50PIDqv6+HsdxP9iQe5ALqdhz0T5gwPj/qqpWnaf1DDwnJcQBxatT8P2sBnPEcZuz3GXgN6WCcyT93Y2Fc4xXBw7gt2NVnz92MsRdlP/+DwAA//+3uPZ2YCkAAA==";
+  var serializedRuntimeTypeInfo = "H4sIAAAJbogC/+xaT4/bRBS3vYFNt1Rd+m8Nha0XBESFxhEIKUovWbFBQRQUWFRRcYi8zpQYre1gO6vtrUeOfAyO/Rh8BI49cuS4NzrTvKmd8YztOI6dSB3padaO1zPvN+/93m8mUaVZ24X+H+jZ+4PItYytDtdfYruHzXZ/czudAPlBp3OGPN9yHcv5tdPpT23D+RH57tQz0ZERGCeGjzjvYcfrQ38f2xfYfno06A2/7T3qkIGaZJxmOExTNIr4/X9Dr2HbinzehX4MfQtbI3X8IzQxvMBGTtDEz36c+nzPnpy6TxBa3r82zJ/61WDWSauF1+S5/iU+HrvyPO7R9j9uLQYfco/0P0v8dg3bDrYQmdn9T7DdgXhJgDE2v8vY3sBmYvsFmz52baR705FrWw7ydPI+3ffM2R+T6cmpZeqWEyDvsWEiXz+xnBEewtfJmL4eDjokN4bmqUUWj/yz/QofJTL+RA7jIYpzQ5YSWxqe7Yx4XgH/jw8f9I4h5z5Kx7FJn2fxfAv8KwvPRfMoK85ywThfhjw56j18ef0ptg8z4EyfZ3G+suY4ayw/AqAXtXy4DgS47gIXU+Yjsfu+CNeQHuM8hW27RDzZ+tACfAbKPB+2mXnuSNlaGr5sE92/DrGLALqhNeLG49vYLpWIHw8fOZq4TKvnxEdm+IJthO9ISDuGjXi4XCsZl11mfjycCN/XZXE+5cFJSYkjWrdHTN1m8boO3FZmHvL811L0xqJ8KNKlEvCAxoxLP38G6/Sc0VFdZj2eMfqT8uZ/CbwZnY/G0bPbkfuUB46Rd2aZ6HsI99w6nXD0TeKP4PPPsd0V8bhYtsbiaQ/Wr6x4youHKog/FfiFcpEC8dKA+/S51puz/o+rEC+35nmLPncB/V9b+fKcxlVavTgcjSLVNu6fWrJ+YeOb4nCu5PO/LfD/NmAQ8f+eh36f4klxcaCtzPoQzXtRfZDk1eiMRoqOozqDFy97a1AXVIHuXHR/nlQPZAEPRONWLThu38N2Ixa3/sR1fLQpcbtIKypur0Kd9Kcmdsvn8tzdCnESxZWoLjyvLbb/zVoXboKu+2GKvCcJ+7B316Qu/LlVbH5RvTPnf6QyVJ1f7LmUJlezDxXl2Q7MD7af3LjZq3j/mdTqgnMlVsefC/afT5fQ8VuR99D9zHeW83Dm43x8eijwLHSGho+x78gbTjzLCQR461XGZwq/qYxmVlPqab1WbL7vY7vFyXdaUdct35/Km6UHb4NeKbtOyCvSgzzcyfoM5NXwyfmK+eQGnI0xNCLx1vF+RetI8KHz2Gb2pcvyDKuv+gDYv7X587Ks60b5ZtV14B04yz0MAsMcf/1y9QZ08Tjrt1+xXqMOjXPqta4AzwPAIobD3G7+tW5bVrftAwdUqduUhPPwZb83EOGVlR8JPp9VdO7B48ek/WWSzqKAaEqxefoBaFFenoanF6/PL/KeX5D4+2oDzi+6EF8TJfxOJU99XVYXKSn1dQ8wf2D5AVV/34ziuB+syTnIhVTsvugOYMD4/6qqVp2n9Qw8JyXEAcWrXfD5rAZjxHGbsdwm8JtSwT6S/u7GwjnGqwMH8NuxqvcfOxniLsp/LwIAAP//eB9e3mApAAA=";
 
   // Deserialize RuntimeTypeInfo
   var bytes = BASE64.decode(serializedRuntimeTypeInfo);

diff --git a/mojo/dart/packages/_mojo_for_test_only/lib/regression_tests/regression_tests.mojom.dart b/mojo/dart/packages/_mojo_for_test_only/lib/regression_tests/regression_tests.mojom.dart
index 4d91c34..f06d9b3 100644
--- a/mojo/dart/packages/_mojo_for_test_only/lib/regression_tests/regression_tests.mojom.dart
+++ b/mojo/dart/packages/_mojo_for_test_only/lib/regression_tests/regression_tests.mojom.dart

@@ -3292,7 +3292,7 @@
   // serializedRuntimeTypeInfo contains the bytes of the Mojo serialization of
   // a mojom_types.RuntimeTypeInfo struct describing the Mojom types in this
   // file. The string contains the base64 encoding of the gzip-compressed bytes.
-  var serializedRuntimeTypeInfo = "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";
+  var serializedRuntimeTypeInfo = "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";
 
   // Deserialize RuntimeTypeInfo
   var bytes = BASE64.decode(serializedRuntimeTypeInfo);

diff --git a/mojo/dart/packages/_mojo_for_test_only/lib/sample/sample_factory.mojom.dart b/mojo/dart/packages/_mojo_for_test_only/lib/sample/sample_factory.mojom.dart
index 0c035cd..dea6215 100644
--- a/mojo/dart/packages/_mojo_for_test_only/lib/sample/sample_factory.mojom.dart
+++ b/mojo/dart/packages/_mojo_for_test_only/lib/sample/sample_factory.mojom.dart

@@ -1764,7 +1764,7 @@
   // serializedRuntimeTypeInfo contains the bytes of the Mojo serialization of
   // a mojom_types.RuntimeTypeInfo struct describing the Mojom types in this
   // file. The string contains the base64 encoding of the gzip-compressed bytes.
-  var serializedRuntimeTypeInfo = "H4sIAAAJbogC/+xaT3PbRBRfyS41UIITpo1oG+q0tBgYYtMLmZwyAyHpMAMdwoEOh+A4G6JQWUJSmHDjmGOP/Qh8hHwMPkaPHLnBbvTWkZ52JVm1/jjjndlZ/5X2/fb32/fe6hkkaG0Y/4IRf74eeq+x3oL3d1h/j3VvYDnP6cbGtwOLHny3f0yHvvT3+Lp9GB/AtX549nRr75utZxvBBdfw9VTXOYexy3qT9Q6a948wOjDeY31Zcr+vB0Pfdv/IPB/Vdb6nv51Qz7+YhyH93nPskUd3YL7cjgbCmb9/0YnibnwSff8zANhBuIj2D4w7JN7+Y62PcOKf8XGTyNu7rF9nXeB0i71eGK//GL7Y+vD5vcX6T6zvst47si3ac08ObMscUbdn2cd2z3OHwQvnZP+5OeyZI5+6h4Mh9Xr75ujAHP3i9XyGqtcLbrd3GNxujf/JkvKiC+Nd1q/Ba46bDvg2Qzy8Fvr9GRCtsxCMfy8G45ERva7A/RWML5tRvNJwJwj3bgruX9m7/snhYczOVbCpaHwxz4Tdp4189vYV9i6DzWDvZy7oCdstWhm80kP3PdKCcVOyP3Ie/Uuytax4EcRnFT9UOHF+LJXID4Lub6B5iv0xbf+U4dtMwLeVE18tBd8bcF/HdKhsn+H4fl4Cvu3QfLUE/0qArwYhperWgDld6jbwc3Pdylsb1k6F0314XbVuxTxF3JIW12wq4saqdOvTU1+m2/ug3bJ0SxRxtEq3qjij34jaP604Q6wz6PcxxutBxXFGWy90v3osAo2q9ivMi0n9X1H7VJr/47x4VLKO9BQdaSj/CH8v8iIjJ5/WFTi9z/pilE/BhqjIW+vEK61CXqn2Z86rL2q2P2uS/FLwC+Onk2L49aVLBz7FpxFx/D6saL8WODg59aU6f1gFDGL2jzPE+uusijjzbTjvsPePlTxZLZEnuuR8iMBZIp8rZnbW87jX1e05xFWNKetWxMuQ1z6xHNv16cETgSBej4cV6/Zsyrrtwr1U9s9C3FVH3T6CHKYq3fZDedRt1k1Y2LXYCge/+xS0PNZxyh/yxnciMXqRk8c7ivX4GPbJBB7PTLxXVz5vz/mc6p+aU/ZPK6zf5HYMfqWymeN1+uiK+aeHgIHU/lBsOdfzZHrulhxXkhnxT0XxmO+fHyTwWDinOY8n5/HWnMcxHjsQZ51p0fXYROvxEtWXCB6fJ5xDh+fTkcRT1yV54y51fzeHFwcDmepTVPnmbXheqkgzY/y4U1J9Q5o9RsLzGz20nvi52NNG8vOGvLrLWtewS/2LNcPzv3vFnjeIugawt/K6hrqfC49AyDJeLM7QubDgU0sv5rmd0NG2QkcrFevoFSlGR9s10VErAz9Igj8r+vnmJU7V1mPM6n6zApyr636jyi+MN7LhNGn9p6jPQvWf4uMYfjfgf0Xjh+t/u6LeB3T1Z0PNO0Iua0TL4t2bsI6nivPCd2Dti8Zt0jqDZsH1Oqo6gwX4rOw6Oxk+etigKdUz6Sjfw20J8gzLdukeB8mT84br9F6J/l4DewRvWhL/ouXI99s5cWy8Zr6/BOcoZeJXl3w/vH+q/Mp6Y7p+BdcXivgOlRXG1ulmSX4F58uGNlt+5Nbcj0TwWK7Ij6TVfYrf/x8AAP//euMnypg1AAA=";
+  var serializedRuntimeTypeInfo = "H4sIAAAJbogC/+xaT3PbRBRfyS41/1KnGRpR2tShbXBhiE05kMkpM1CaDjPQIRzocAiOsyEKlSUkhQk3jjn22I/AR8jH4GP0yJEb7EZvHelpV5JV648z3pmdtWVZ2vfb3/u3+wwStDaMf8GIr2+Evmust+D7B6wvse4NLOc53dz8dmDR/e/2jujQl96Pn9uH8S4864dnTx/tfvPo2WbwwHX8PNVzzmDsst5kvYPm/SOMDox3WF+WvO/rwdC33T8yz0f1nO/pb8fU88/nYUh/9xx75NFtmC+Xo4Fw5t9fdKK4Gx9Hv/8MAHYQLqL9A+M2ibf/WOsjnPg1Pm4RebvG+lXWBU432OeF8fqP4Yutzyrrb7H+E+s7rPcObYv23ON92zJH1O1Z9pHd89xh8ME53ntuDnvmyKfuwWBIvd6eOdo3R794PZ+h6vWC1+0eBK9b53+ypLzowniL9SvwmeOmA77NEA+vhO4/BaJ1FoLx78VgPDSizxW4v4LxZTOKVxruBOHeTcH9K3vHPz44iMn5IchUNL6YZ0Luk0Y+efsKeZdBZpD3Uxf0CcstWhm80kPvPdSCcUtiHzmP/iXZWla8COKzih8qnDg/rpfID4Leb6B5CvuYZj9l+DYT8G3lxFdLwfcdeK9jOlRmZzi+n5WAbzs0Xy3BvxLgq0FIqXprwJwu9Dbwc3O9lbc2rJ0Kp7sQX1Wtt2KeIm5Ji2u2FHFjVXrr0xNfprcc33sl6i1RxNEqvVXFGf1GVP5pxRlinUF/H2K87lUcZ7T1Qu3VQxFoVGWvMC8m9X9F2ak0/8d5sVayHukpeqSF7sd8EnmRkZNPGwqc3md9McqnwCAq8tY68UqrkFcq+8x59UXN7LMmyS8FvzB+OimGX1+6dOBTvBsRx+9+RfZa4ODk1C/V/sMqYBCTf5wh1l/Pqogz34b9DnvvSMmT1RJ5oqP3i+tLMFfM7Kz7ca+rt2cQVzWmrLciXoa89onl2K5P958IBPF6rFWst6dT1tsuvEsl/yzEXXXU27WS/KNKb/uh/Y+brJuwsOuxFQ7u+wR0eazHKX/IG9+JxOhFTh5vK9bjAdjJBB7PTLxXRz5/VFIeUXc+p/mn5pT9023W3+NyDH6lspnLzlUuk3+6DxhI5Q/FlnN9nkyf+f8+r3D/sq7+qSgec9u5ksBj4ZzmPJ6Mxw/ARsx5HP3dgTjrVIuuxxZaj5eovkTw+CxhHzo8n44knroqyRt3qPu7OTzfGMhUn6LKN2/CeakizYzx41ZJ9Q1p8hgJ5zd6aD3xudjTRvJ5Q169y1rXsEP98zXD8799yc4bRF0DyFt5XUPd94VHoMgyXizO0L6w4FNLL+bcTujRY4UerVSsR69IMXr0uCZ61MrAD5Lgz4o+37zAqdp6jFm1NyvAubraG1V+YbyRDadJ6z9FfRaq/xSXY/i9C/8rGj9c/9sV9T6gV3821Lwj5KJGtCzevQnreKLYL1yAtS8at0nrDJoF1+uo6gyuwbWy6+xk+OhhgaZUz6SjfA+365BnWLZLdzlInpw3fLxTor/XQB7Bm5bEv2g58v12Thwbr5nvL4HNLxO/uuT7Yfup8isbjen6FVxfKOI7VFYYW6cbJfkVnC8b2mz5keW5H4nti1ThR9LqPsX9/wcAAP//M5QIlJg1AAA=";
 
   // Deserialize RuntimeTypeInfo
   var bytes = BASE64.decode(serializedRuntimeTypeInfo);

diff --git a/mojo/dart/packages/_mojo_for_test_only/lib/sample/sample_service.mojom.dart b/mojo/dart/packages/_mojo_for_test_only/lib/sample/sample_service.mojom.dart
index c5a0e66..6e3b6e8 100644
--- a/mojo/dart/packages/_mojo_for_test_only/lib/sample/sample_service.mojom.dart
+++ b/mojo/dart/packages/_mojo_for_test_only/lib/sample/sample_service.mojom.dart

@@ -2195,7 +2195,7 @@
   // serializedRuntimeTypeInfo contains the bytes of the Mojo serialization of
   // a mojom_types.RuntimeTypeInfo struct describing the Mojom types in this
   // file. The string contains the base64 encoding of the gzip-compressed bytes.
-  var serializedRuntimeTypeInfo = "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";
+  var serializedRuntimeTypeInfo = "H4sIAAAJbogC/+ydTXATyRWAZ0aSkY0X29hgY35s/hKxxfqPP7PkxxDMiiwYx2gJbCprj+0xEkgeRRp5zZ58WzYnjhx95JADhxyo5MIhVdlLEmpPSWWrQqVSCUcOOewJMmO9FqPW6543YzMjqjJVYjya0UzP169fv9fvddOnVLdO2I/Anv+e7ZPcnr/ur2p1f9P+tNmfafg+C/s12K/D/gnsn8P+O3Y/uM84ux/s99qfbvuTuTU9Ofvx5K0Py3qhmDeGLuiljfODUCbk/FDmXtE4Yp/bh5y/aCzplbxVzhhlS/acS6a58Zzj9ucIcn7KXJ6q5PP6fN64qhevW6XKwsb9nGf2INdPm6WN8wP2pxc5f90oreQWDOV9+9wh8Xn7/b64VrRy5nK5yikFLBqu3yjRz3NWNm3mjRujxOvGHkF9OvXsVMVDrt7ntr05ds4/ea/++MXp+uOvP35zHHPkYqr+eDVTf/+H8/W/X1+qP07fUWr175bLCZCbhy3VfVpp3F7bG5P7cdd3G7+H48fcb7ZDOZnc7QQ+nDg2tA8Hi4PqF/bnuv0ZzpoFY7hUWTQLuWWjNFww75jD5dJC9Y9iZT6fWxjOLVtGaUlfMMrD87nlxdzy7fKwZQtqebj6uNkySIHzowL6XEWp58Xar1d7ceQj7uKaBp7TGrTLGHDm+LHnbuOOXyj4lhZ8PyL4PiX43uGbsD96vpjVEQ498O5vmz+vLzvh79cKjRe/qQReKsJL9eDVDvU7b1g6Jje7QuLll4dG4KEhPDSi/NzWCwVMfnZHyCPh7h+V+v4xTuARQ3jEiPJh2boAk4/ekPTZIKLH3OVh5cxAOb30Gq8HU0p9/zEu4MHuy91u6MbkTObyT85fOWafOyh5bu1CgT7ucz0rjrxnJ2cfBe3P2PZIwM+p147G92wox46Q6t/L7uP7qSzweQwN/kWsvj9JcRzZ+wyq9XrTL19RP8b0P6t+LzniOXfA+4XRzrzaTczFh+c5qMr1tRfPCY7nTQFPZm+lr81c/vTaVIY1KMdG7ke48tdh/k0z8BXJpyLQ21sln6z9X7iWSbv9FZ4jO8/z63rH+MW3mF8H6MHLUzfOX7l8sebP8fzYeZ7fzibhx/tPScbvWLD2Oy3g1QMyJ/K7BW55A7cPQup/HA6Dro4hBQptHRri1yBQLxPADwzXCejYs63V/YM2GPfYDuMe7cB5B+jTDvCr4AXXuqCf3lndP+uGcZIe0Le7oV56wQ8HQKn+6v7+XijXPijXASjXAJQLKnztIPjJh6DfPAzvdQTKeVTut8RC9vPaoE/RR3B9PhySXGB+nsPiv0owv/ht+Xk1XqM4r5EQ/WKZ3S2Sg91ga4JeuJv53MivGOJxM3aBiH9cwP9t+ZU1/mM4/9EIxyUcFt/E5fKaFPB6W35njdcJnJeDsTUiXs5zt30p55UQ8EoSeMURXnEqr5M4rxMRypfDYuKfqpRXq4BXO4FXAuGVoPI6hfM6GaF8OWXrudP2ZxmvFgGvTgKvFoRXC5XXaZzXqQjlyyn72VcXDv7btjlFvNoEvPoIvLYhvLZReZ3BeZ2OUL62b9jn//kqfviPv/arvwYJvJIIrySV1zjO60zE+mvysBpI3x8h8GpFeLVSeZ3FeY1HzOv33756HYRXisCrDeHV5sGLxev00RGU19kmt78UAa8WAq/tCK/tZF6jKK8PI/Sv3P5OEF6qB692hFc7mdcYyutcxLwUD16agNdxgny9h/B6j8zrBMrrBxG2x5p8PPtsQsRLFfAaIfDagVy3g8zrJMrrhxHaEw6Lc//48rdrxjfn/fIaJ/DqQHh1kHmdQnn9KGJejik1u65d8MtrgsCrE+HVSeZ1GuX144h5rf39bw9uJPr/4JdXmsCrC+HVReZ1BuU1ETGv0crKX/7V9qdzGC/NlUfAb9MEXjsRXjvJvMZRXpPQpsPMI3BiFPx4LMZLlfC6SeDVjfDqJvM6i/K6FLJ8yewHWV7KHIFPD8Knh8pnDLfn03BN1HkpLO7vjq9tJi8lRYzfOuGa/bI8FLjQqz75LUuoz11Ife4i1yfub1wGnRxVfQ5ycYhcoWiWLGNxaNq0n4LEIbgLKO3GqXeWr1okcN6NcN5N5oz7KT9tVs6ZrH1bGefqBUkPP0c0DrhK4N2L8O4l88b9nCuRjwNWN7/jzGsEXn0Irz4yL9zPuRrxOPNXt6sjgX553Sfw2oPw2kPmhfs5UxHz+vzh7759JZEvkd3+gMCrH+HVT+aF+znTIbZHjTAuI+LzkMBnL8JnL5kP7tf8LGQ+akA+6wQ++xA++8h8cD9mJmQ+WsBxvUUCn/0In/1kPrjfcj1EfaS58gz88nlE4HMA4XOAyucE7rdkQuYTD8jnNwQ+AwifATIf3A/4JGQ+Cc4+x/L0HZv1CWe/svNsvtTjHjGnzcw/Y/MRufln7OsGfv1KuPPPFMH4FDtm+drIPMuhu/Y/8/fe2JsdLjt9DbjeBwF9DA39CQj0U0Ee5lMIrKYhADYHgZ11CFg8h4H4cQD2tEshxX29Nmreo1ceXytcs6rg9btfiXa+logHJU8My2vUiDzuCXgciJiHKA5JyQPD8gxjRB66gMfAOxK3xXJKvOK2WJ5hnMhrXsBrMCReQXhoHjywPMIEkceCgMfBCHnIxiUpeW9YnmAL0R6Zh3lmPI9DSrjzH1XBODM/H91rvpzfuBAlTw7LK0wSx60XdXz+8RH4O0y+1LiQpiiNCfucHSjjJcsrFOXBMzvPWLVK+qwtlWW8nR6G8dMouCWU+vUFZPGRrZBbFYk/fSeQO2q+okKU22W9gM6L3hdRfC5o/GgHtF9mc1Ptcqw+4hI9QsnnDpIPycpfNiulBaOxPo5CHYVVHyqL5/jUG5T8IVn+o0iOnfib4+LklosVa7ZslQy9UEbk9nvAKgq9EVfwvDUtAEdKXpEsL9JrHpJZsepA8hy/34QcYxKOSQHHCQJHWb6kaB0FFsfTSyX93qy5NFv7Y9408+UGnilgHwVPTdCfue0ExcNOEPGl5CfJ8itFfA8Ar0Ilb+XewLXl1aHQKK/HoE6aka/XeVXxl+8q0xuU/CdZ/qaX3uDEvKEe3lfCzYNSBXIsG+90yjcnGO/s48blvMY709x455yAH1uPQLS+2mGwHT2WYWvgXQ5xPMTNE5PLmEQuKeOJbq5edgXbusC2KujF2aWckV8U+P1WSPp3RCCHfZJj2TiATI5VJO+E93NfKpsbtxf5DWzdv26wObjlABvezwQbL+x149zrK6k+/IyXmxwHZxxFcsu4TZtl66pRLuu3DbT8RdD3YenTPu7978f8tVf23qJ+nfnHrvf+oGT8qiJaH4NtYciN5nruiKpI/fXN6DmZXIi+Z+uNFKrMZi1j1RLJS6/SfHm1imBczW88hboeYBEUEcbnuNI8670xhem1vqqsH9Bcx6J+4L66tfFbtl4QW9+VW9+Cfd3AfyGifiAt0Pt+16Xlfy9aR5f9/u4lfcUs5SzDvpGsf3LnU6mIPnqWlPdT2Za3008x++pSybTR65YhsK9yEfdTE4mt7af2wLvX3ruul4qunxoEO5s9vwjt+rkWTA9vtr/yijstQSIHJi/dTRR3YgknXutmN0s/9yau94WQ71El+jx4Fu/h9ahfveuXe3vA/ARtk/aFw32sCeR6K+2LmOt5Iv2b1LZW//aD7Lj1b7loi4MRrf6ljIO48xTC0rcsfmRTquQtXC4vRsBHNF7B2zEvBPqPqi+ZPIn4MHv1I8PaEHmez52I7Bf23tMB249ITtj6x/C+NeulmdtNFHaKlz6/A3ooLLnQQtDnqiJelztF9BMnODnk5xE/9ej/D4KN7dHtN5RvMaTxbq//z4T3z1bVevnj15OuzatX/Y2Dj3tw5vXbzORHn1w5P6OwddyFfIfYlThnQwlnPd8g/ncMae8pLn6j+OhPZLxF6/+y/2dh8mZm5jzEywekvKtX8pyXmpQz30+x+O9qLJh+EHHsAxb8/+vDrT/Nn27geFMJb16Au92PqzQ7MMi6wrJ4mNe6aiuCdXJvKdHNp3Svuy/iJZp/mgzIi7qu8IpgXdtPI+alEeKAsvFf1m4fx0Npt2PydjvWwPeXSnj5x+5xM9YPZ7V3q/1+9v/266v9zjZJ+/UrX/GAvKjreK8I1qWei5hXjKDv3O34fwEAAP//5QGdlQByAAA=";
 
   // Deserialize RuntimeTypeInfo
   var bytes = BASE64.decode(serializedRuntimeTypeInfo);

diff --git a/mojo/dart/packages/mojo_services/lib/mojo/gfx/composition/compositor.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/gfx/composition/compositor.mojom.dart
index 7b6bad8..67e3ef3 100644
--- a/mojo/dart/packages/mojo_services/lib/mojo/gfx/composition/compositor.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/mojo/gfx/composition/compositor.mojom.dart

@@ -8,10 +8,10 @@
 import 'package:mojo/core.dart' as core;
 import 'package:mojo/mojo/bindings/types/service_describer.mojom.dart' as service_describer;
 import 'package:mojo_services/mojo/geometry.mojom.dart' as geometry_mojom;
-import 'package:mojom/mojo/context_provider.mojom.dart' as context_provider_mojom;
+import 'package:mojo_services/mojo/gfx/composition/renderers.mojom.dart' as renderers_mojom;
 import 'package:mojo_services/mojo/gfx/composition/scene_token.mojom.dart' as scene_token_mojom;
 import 'package:mojo_services/mojo/gfx/composition/scenes.mojom.dart' as scenes_mojom;
-import 'package:mojo_services/mojo/gfx/composition/renderers.mojom.dart' as renderers_mojom;
+import 'package:mojom/mojo/context_provider.mojom.dart' as context_provider_mojom;
 const int kLabelMaxLength = 32;
 
 

diff --git a/mojo/dart/packages/mojo_services/lib/mojo/ui/view_manager.mojom.dart b/mojo/dart/packages/mojo_services/lib/mojo/ui/view_manager.mojom.dart
index 7b19ea4..57c3cb7 100644
--- a/mojo/dart/packages/mojo_services/lib/mojo/ui/view_manager.mojom.dart
+++ b/mojo/dart/packages/mojo_services/lib/mojo/ui/view_manager.mojom.dart

@@ -7,9 +7,9 @@
 import 'package:mojo/bindings.dart' as bindings;
 import 'package:mojo/core.dart' as core;
 import 'package:mojo/mojo/bindings/types/service_describer.mojom.dart' as service_describer;
-import 'package:mojo_services/mojo/ui/views.mojom.dart' as views_mojom;
 import 'package:mojo_services/mojo/ui/view_associates.mojom.dart' as view_associates_mojom;
 import 'package:mojo_services/mojo/ui/view_trees.mojom.dart' as view_trees_mojom;
+import 'package:mojo_services/mojo/ui/views.mojom.dart' as views_mojom;
 const int kLabelMaxLength = 32;
 
 

diff --git a/mojo/public/tools/bindings/mojom_tool/bin/linux64/mojom.sha1 b/mojo/public/tools/bindings/mojom_tool/bin/linux64/mojom.sha1
index 184373a..0b39bc6 100644
--- a/mojo/public/tools/bindings/mojom_tool/bin/linux64/mojom.sha1
+++ b/mojo/public/tools/bindings/mojom_tool/bin/linux64/mojom.sha1

@@ -1 +1 @@
-01910f7a73aaeeed2ffa33d58cbb86dc64b1ad36
\ No newline at end of file
+ea7789ed2e25308eeee9daa0624a7dd97991e9ae
\ No newline at end of file

diff --git a/mojo/public/tools/bindings/mojom_tool/bin/mac64/mojom.sha1 b/mojo/public/tools/bindings/mojom_tool/bin/mac64/mojom.sha1
index 5e772cd..4d7de93 100644
--- a/mojo/public/tools/bindings/mojom_tool/bin/mac64/mojom.sha1
+++ b/mojo/public/tools/bindings/mojom_tool/bin/mac64/mojom.sha1

@@ -1 +1 @@
-f1a0a3805fcea8a1f22ec5995c302eb0ae742fe3
\ No newline at end of file
+1f12ea6dbe9b5c08c5591313028146537a89ac47
\ No newline at end of file

diff --git a/mojom/mojom_parser/mojom/computed_data.go b/mojom/mojom_parser/mojom/computed_data.go
index 615da1a..8a92f2e 100644
--- a/mojom/mojom_parser/mojom/computed_data.go
+++ b/mojom/mojom_parser/mojom/computed_data.go

@@ -270,10 +270,14 @@
 func (i *MojomInterface) ComputeFinalData() error {
 	for _, method := range i.MethodsByOrdinal {
 		if method.Parameters != nil {
-			return method.Parameters.ComputeFinalData()
+			if err := method.Parameters.ComputeFinalData(); err != nil {
+				return err
+			}
 		}
 		if method.ResponseParameters != nil {
-			return method.ResponseParameters.ComputeFinalData()
+			if err := method.ResponseParameters.ComputeFinalData(); err != nil {
+				return err
+			}
 		}
 	}
 	return nil

diff --git a/mojom/mojom_parser/serialization/serialization_test.go b/mojom/mojom_parser/serialization/serialization_test.go
index 56e4235..0714b4d 100644
--- a/mojom/mojom_parser/serialization/serialization_test.go
+++ b/mojom/mojom_parser/serialization/serialization_test.go

@@ -1474,6 +1474,138 @@
 	}
 
 	////////////////////////////////////////////////////////////
+	// Test Case: Method parameter versions.
+	////////////////////////////////////////////////////////////
+	{
+		contents := `
+	interface MyInterface42 {
+		DoIt(int8 x0, [MinVersion=1] int64 x1, [MinVersion=2] int8 x2)
+		    => (int8 y0, [MinVersion=1] int64 y1);
+
+		DoItAgain(int8 x0);
+	};`
+
+		test.addTestCase("", contents)
+
+		test.expectedFile().DeclaredMojomObjects.Interfaces = &[]string{"TYPE_KEY:MyInterface42"}
+
+		test.expectedGraph().ResolvedTypes["TYPE_KEY:MyInterface42"] = &mojom_types.UserDefinedTypeInterfaceType{mojom_types.MojomInterface{
+			DeclData: test.newDeclData("MyInterface42", "MyInterface42"),
+			Methods: map[uint32]mojom_types.MojomMethod{
+				// DoIt
+				0: mojom_types.MojomMethod{
+					DeclData: test.newDeclData("DoIt", ""),
+					Parameters: mojom_types.MojomStruct{
+						DeclData: test.newDeclData("DoIt-request", ""),
+						Fields: []mojom_types.StructField{
+							// The fields are in ordinal order and the first two arguments to newShortDeclDataO() are
+							// declarationOrder and declaredOrdinal.
+							// x0
+							mojom_types.StructField{
+								DeclData:   test.newDeclDataO(0, -1, "x0", ""),
+								Type:       &mojom_types.TypeSimpleType{mojom_types.SimpleType_Int8},
+								Offset:     0,
+								MinVersion: 0,
+							},
+							// x1
+							mojom_types.StructField{
+								DeclData:   test.newShortDeclDataAO(1, -1, "x1", &[]mojom_types.Attribute{{"MinVersion", &mojom_types.LiteralValueInt8Value{1}}}),
+								Type:       &mojom_types.TypeSimpleType{mojom_types.SimpleType_Int64},
+								Offset:     8,
+								MinVersion: 1,
+							},
+							// x2
+							mojom_types.StructField{
+								DeclData:   test.newShortDeclDataAO(2, -1, "x2", &[]mojom_types.Attribute{{"MinVersion", &mojom_types.LiteralValueInt8Value{2}}}),
+								Type:       &mojom_types.TypeSimpleType{mojom_types.SimpleType_Int8},
+								Offset:     1,
+								MinVersion: 2,
+							},
+						},
+						VersionInfo: &[]mojom_types.StructVersion{
+							mojom_types.StructVersion{
+								VersionNumber: 0,
+								NumFields:     1,
+								NumBytes:      16,
+							},
+							mojom_types.StructVersion{
+								VersionNumber: 1,
+								NumFields:     2,
+								NumBytes:      24,
+							},
+							mojom_types.StructVersion{
+								VersionNumber: 2,
+								NumFields:     3,
+								NumBytes:      24,
+							},
+						},
+					},
+					ResponseParams: &mojom_types.MojomStruct{
+						DeclData: test.newDeclData("DoIt-response", ""),
+						Fields: []mojom_types.StructField{
+							// yo
+							mojom_types.StructField{
+								DeclData:   test.newDeclDataO(0, -1, "y0", ""),
+								Type:       &mojom_types.TypeSimpleType{mojom_types.SimpleType_Int8},
+								Offset:     0,
+								MinVersion: 0,
+							},
+							// y1
+							mojom_types.StructField{
+								DeclData:   test.newShortDeclDataAO(1, -1, "y1", &[]mojom_types.Attribute{{"MinVersion", &mojom_types.LiteralValueInt8Value{1}}}),
+								Type:       &mojom_types.TypeSimpleType{mojom_types.SimpleType_Int64},
+								Offset:     8,
+								MinVersion: 1,
+							},
+						},
+						VersionInfo: &[]mojom_types.StructVersion{
+							mojom_types.StructVersion{
+								VersionNumber: 0,
+								NumFields:     1,
+								NumBytes:      16,
+							},
+							mojom_types.StructVersion{
+								VersionNumber: 1,
+								NumFields:     2,
+								NumBytes:      24,
+							},
+						},
+					},
+				},
+
+				// DoItAgain
+				1: mojom_types.MojomMethod{
+					DeclData: test.newDeclData("DoItAgain", ""),
+					Parameters: mojom_types.MojomStruct{
+						DeclData: test.newDeclData("DoItAgain-request", ""),
+						Fields: []mojom_types.StructField{
+							// The fields are in ordinal order and the first two arguments to newShortDeclDataO() are
+							// declarationOrder and declaredOrdinal.
+							// x0
+							mojom_types.StructField{
+								DeclData:   test.newDeclDataO(0, -1, "x0", ""),
+								Type:       &mojom_types.TypeSimpleType{mojom_types.SimpleType_Int8},
+								Offset:     0,
+								MinVersion: 0,
+							},
+						},
+						VersionInfo: &[]mojom_types.StructVersion{
+							mojom_types.StructVersion{
+								VersionNumber: 0,
+								NumFields:     1,
+								NumBytes:      16,
+							},
+						},
+					},
+					Ordinal: 1,
+				},
+			},
+		}}
+
+		test.endTestCase()
+	}
+
+	////////////////////////////////////////////////////////////
 	// Test Case: 3 boolean fields
 	////////////////////////////////////////////////////////////
 	{
commit	d100172713b0b1fd26dddab3474bb83bbb15a8db	[log] [tgz]
author	Mitch Rudominer <rudominer@chromium.org>	Fri Mar 25 17:57:10 2016 -0700
committer	Mitch Rudominer <rudominer@chromium.org>	Fri Mar 25 17:57:10 2016 -0700
tree	689a303b491290ff34c2e2d6cdd09809c1286c27
parent	b26cde572364fbb2d0a3fb8368fed8ab05afaa8d [diff]