Dart: Removes name conflicts from generated bindings.

mojo/public/dart/src/codec.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.
 
 part of bindings;
 
 int align(int size) => size + (kAlignment - (size % kAlignment)) % kAlignment;
 
 const int kAlignment = 8;
 const int kSerializedHandleSize = 4;
@@ skipping 190 matching lines @@
   void encodeInterface(Stub interface, int offset, bool nullable) {
     if (interface == null) {
       encodeInvalideHandle(offset, nullable);
       return;
     }
     var pipe = new core.MojoMessagePipe();
     interface.bind(pipe.endpoints[0]);
     encodeMessagePipeHandle(pipe.endpoints[1], offset, nullable);
   }
 
-  void encodeInterfaceRequest(Proxy client, int offset, bool nullable) {
+  void encodeInterfaceRequest(ProxyBase client, int offset, bool nullable) {
     if (client == null) {
       encodeInvalideHandle(offset, nullable);
       return;
     }
     var pipe = new core.MojoMessagePipe();
-    client.bind(pipe.endpoints[0]);
+    client.impl.bind(pipe.endpoints[0]);
     encodeMessagePipeHandle(pipe.endpoints[1], offset, nullable);
   }
 
   void encodeNullPointer(int offset, bool nullable) {
     if (!nullable) {
       throw new MojoCodecError(
           'Trying to encode a null pointer for a non-nullable type');
     }
     _buffer.buffer.setUint64(_base + offset, 0, Endianness.LITTLE_ENDIAN);
   }
@@ skipping 366 matching lines @@
 
   core.MojoDataPipeConsumer decodeConsumerHandle(int offset, bool nullable) =>
       new core.MojoDataPipeConsumer(decodeHandle(offset, nullable));
 
   core.MojoDataPipeProducer decodeProducerHandle(int offset, bool nullable) =>
       new core.MojoDataPipeProducer(decodeHandle(offset, nullable));
 
   core.MojoSharedBuffer decodeSharedBufferHandle(int offset, bool nullable) =>
       new core.MojoSharedBuffer(decodeHandle(offset, nullable));
 
-  Proxy decodeServiceInterface(
+  ProxyBase decodeServiceInterface(
       int offset, bool nullable, Function clientFactory) {
     var endpoint = decodeMessagePipeHandle(offset, nullable);
     return endpoint.handle.isValid ? clientFactory(endpoint) : null;
   }
 
   Stub decodeInterfaceRequest(
       int offset, bool nullable, Function interfaceFactory) {
     var endpoint = decodeMessagePipeHandle(offset, nullable);
     return endpoint.handle.isValid ? interfaceFactory(endpoint) : null;
   }
@@ skipping 75 matching lines @@
           result[boolIndex] = (bytes[i] & (1 << j)) != 0;
         }
       }
     }
     return result;
   }
 
   ArrayDataHeader decodeDataHeaderForArray(int elementSize,
                                            int expectedLength) {
     var header = decodeArrayDataHeader();
-    var arrayByteCount = 
+    var arrayByteCount =
         ArrayDataHeader.kHeaderSize + header.numElements * elementSize;
     if (header.size < arrayByteCount) {
       throw new MojoCodecError(
           'Array header is incorrect: $header, elementSize = $elementSize');
     }
     if ((expectedLength != kUnspecifiedArrayLength) &&
         (header.numElements != expectedLength)) {
       throw new MojoCodecError(
           'Incorrect array length. Expected $expectedLength, but got '
           '${header.numElements}');
@@ skipping 151 matching lines @@
       throw new MojoCodecError(
           'Incorrect header for map. The size is incorrect.');
     }
     if (header.version != kMapStructHeader.version) {
       throw new MojoCodecError(
           'Incorrect header for map. The version is incorrect.');
     }
     return header;
   }
 }