Dart: Simplifies the handle watcher. Various cleanups and bugfixes.

mojo/dart/test/codec_test.dart

 // Copyright 2014 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 import 'dart:mojo_bindings' as bindings;
 import 'dart:mojo_core' as core;
 import 'dart:typed_data';
 
 import 'package:mojo/dart/testing/expect.dart';
 
@@ skipping 85 matching lines @@
 
 
 class TestFoo {
   static const String kFooby = "Fooby";
 
   int x = 0;
   int y = 0;
   bool a = true;
   bool b = false;
   bool c = false;
-  core.RawMojoHandle source = null;
+  core.MojoHandle source = null;
   TestBar bar = null;
   List<int> data = null;
   List<TestBar> extra_bars = null;
   String name = kFooby;
-  List<core.RawMojoHandle> input_streams = null;
-  List<core.RawMojoHandle> output_streams = null;
+  List<core.MojoHandle> input_streams = null;
+  List<core.MojoHandle> output_streams = null;
   List<List<bool>> array_of_array_of_bools = null;
   List<List<List<String>>> multi_array_of_strings = null;
   List<bool> array_of_bools = null;
 
   TestFoo();
 
   static const int encodedSize = bindings.kStructHeaderSize + 88;
 
   static TestFoo decode(bindings.MojoDecoder decoder) {
     int packed;
@@ skipping 72 matching lines @@
   foo.extra_bars = [
     new TestBar(), new TestBar(), new TestBar(),
   ];
   for (int i = 0; i < foo.extra_bars.length; ++i) {
     foo.extra_bars[i].alpha = 1 * i;
     foo.extra_bars[i].beta = 2 * i;
     foo.extra_bars[i].gamma = 3 * i;
   }
   foo.name = "I am a banana";
   // This is supposed to be a handle, but we fake it with an integer.
-  foo.source = new core.RawMojoHandle(23423782);
+  foo.source = new core.MojoHandle(23423782);
   foo.array_of_array_of_bools = [
     [true], [false, true]
   ];
   foo.array_of_bools = [
     true, false, true, false, true, false, true, true
   ];
 
 
   var name = 31;
   var payloadSize = 304;
 
   var builder = new bindings.MessageBuilder(name, payloadSize);
   builder.encodeStruct(TestFoo, foo);
 
   var message = builder.finish();
 
   var expectedMemory = new Uint8List.fromList([
     /*  0: */   16,    0,    0,    0,    2,    0,    0,    0,
     /*  8: */   31,    0,    0,    0,    0,    0,    0,    0,
     /* 16: */   96,    0,    0,    0,   15,    0,    0,    0,
     /* 24: */ 0xD5, 0xB4, 0x12, 0x02, 0x93, 0x6E, 0x01,    0,
     /* 32: */    5,    0,    0,    0,    0,    0,    0,    0,
     /* 40: */   72,    0,    0,    0,    0,    0,    0,    0,
   ]);
   // TODO(abarth): Test more of the message's raw memory.
   var allActualMemory = message.buffer.buffer.asUint8List();
   var actualMemory = allActualMemory.sublist(0, expectedMemory.length);
   Expect.listEquals(expectedMemory, actualMemory);
 
-  var expectedHandles = <core.RawMojoHandle>[
-    new core.RawMojoHandle(23423782),
+  var expectedHandles = <core.MojoHandle>[
+    new core.MojoHandle(23423782),
   ];
 
   Expect.listEquals(expectedHandles, message.handles);
 
   var reader = new bindings.MessageReader(message);
 
   Expect.equals(payloadSize, reader.payloadSize);
   Expect.equals(name, reader.name);
 
   var foo2 = reader.decodeStruct(TestFoo);
@@ skipping 211 matching lines @@
 
 
 main() {
   testAlign();
   testTypes();
   testBar();
   testFoo();
   testNamedRegion();
   testUtf8();
 }