Dart: Refactors Proxies

mojo/dart/apptests/dart_apptests/lib/src/service_describer_apptests.dart

 // Copyright 2016 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.
 
 library service_describer_apptests;
 
 import 'dart:async';
 
 import 'package:mojo_apptest/apptest.dart';
 import 'package:mojo/application.dart';
 import 'package:mojo/bindings.dart';
 import 'package:mojo/core.dart';
 import 'package:mojo/mojo/bindings/types/mojom_types.mojom.dart' as mojom_types;
 import 'package:mojo/mojo/bindings/types/service_describer.mojom.dart'
     as service_describer;
 import 'package:_mojo_for_test_only/test/pingpong_service.mojom.dart'
     as pingpong_service;
 
 // Tests that demonstrate that a service describer is able to obtain the same
 // mojom type information present in a service's service description.
 // If the descriptions match, it means that you can see what services are
 // described by a mojo application without importing any of their mojom files.
 tests(Application application, String url) {
   group('Service Describer Apptests', () {
     test('PingPong Service Verification', () async {
       var serviceDescriberProxy = new service_describer.ServiceDescriberProxy.
           unbound();
-      serviceDescriberProxy.errorFuture.then((v) =>
+      serviceDescriberProxy.ctrl.errorFuture.then((v) =>
           fail('There was an error $v'));
       application.connectToService("mojo:dart_pingpong", serviceDescriberProxy);
 
       var serviceDescriptionProxy =
           new service_describer.ServiceDescriptionProxy.unbound();
-      serviceDescriptionProxy.errorFuture.then(
+      serviceDescriptionProxy.ctrl.errorFuture.then(
           (v) => fail('There was an error $v'));
 
-      serviceDescriberProxy.ptr.describeService(
+      serviceDescriberProxy.describeService(
           "test::PingPongService", serviceDescriptionProxy);
 
       // Compare the service description obtained by the service describer and
       // the expected description taken from the pingpong service import.
-      var serviceDescription = serviceDescriptionProxy.ptr;
+      var serviceDescription = serviceDescriptionProxy;
       var serviceDescription2 = pingpong_service.PingPongServiceStub.
         serviceDescription;
 
       Function identity = (v) => v;
 
-
       // Top-level Mojom Interfaces must match.
       mojom_types.MojomInterface interfaceA =
           (await serviceDescriptionProxy.responseOrError(
               serviceDescription.getTopLevelInterface())).mojomInterface;
 
       mojom_types.MojomInterface interfaceB = serviceDescription2.
           getTopLevelInterface(identity);
       _compare(interfaceA, interfaceB);
 
       // Get the type key for the type of the first parameter of the
@@ skipping 55 matching lines @@
     expect(methodA.parameters.fields.length,
         equals(methodB.parameters.fields.length));
     mojom_types.MojomStruct responseA = methodA.responseParams;
     mojom_types.MojomStruct responseB = methodB.responseParams;
     expect(responseA == null, equals(responseB == null));
     if (responseA != null) {
       expect(responseA.fields.length, equals(responseB.fields.length));
     }
   });
 }