Dart: Refactors Proxies

mojo/dart/embedder/io/mojo_patch.dart

 // Copyright 2015 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:nativewrappers';
 
 import 'dart:_mojo/application.dart';
 import 'dart:_mojo/bindings.dart';
 import 'dart:_mojo/core.dart';
 import 'dart:_mojo/mojo/network_error.mojom.dart';
@@ skipping 96 matching lines @@
 /// Get the singleton HostResolverProxy.
 HostResolverProxy _getHostResolver() {
   if (_hostResolver != null) {
     return _hostResolver;
   }
   var networkService = _getNetworkService();
   if (networkService == null) {
     return null;
   }
   _hostResolver = new HostResolverProxy.unbound();
-  networkService.ptr.createHostResolver(_hostResolver);
+  networkService.createHostResolver(_hostResolver);
   // Remove the host resolver's handle from the open set because it is not
   // under application control and does not affect isolate shutdown.
-  _hostResolver.impl.endpoint.handle.pass();
+  _hostResolver.ctrl.endpoint.handle.pass();
   return _hostResolver;
 }
 
 /// Get the singleton FilesProxy.
 FilesProxy _getFiles() {
   if (_files != null) {
     return _files;
   }
   _files = new FilesProxy.fromHandle(
       new MojoHandle(_filesServiceHandle).pass());
   _filesServiceHandle = null;
   return _files;
 }
 
 /// Get the singleton DirectoryProxy for the root directory.
 Future<DirectoryProxy> _getRootDirectory() async {
   if (_rootDirectory != null) {
     return _rootDirectory;
   }
   FilesProxy files = _getFiles();
   assert(files != null);
   _rootDirectory = new DirectoryProxy.unbound();
   var response =
-      await files.ptr.openFileSystem(fileSystemName, _rootDirectory);
+      await files.openFileSystem(fileSystemName, _rootDirectory);
   // Remove the root directory's handle from the open set because it is not
   // under application control and does not affect isolate shutdown.
-  _rootDirectory.impl.endpoint.handle.pass();
+  _rootDirectory.ctrl.endpoint.handle.pass();
 
   // Ensure system temporary directory exists before returning the root
   // directory.
   await _getSystemTempDirectory();
   return _rootDirectory;
 }
 
 /// Get the singleton DirectoryProxy for the system temp directory.
 Future<DirectoryProxy> _getSystemTempDirectory() async {
   if (_systemTempDirectory != null) {
     return _systempTempDirectory;
   }
   DirectoryProxy rootDirectory = await _getRootDirectory();
   int flags = types.kOpenFlagRead |
               types.kOpenFlagWrite |
               types.kOpenFlagCreate;
   _systemTempDirectory = new DirectoryProxy.unbound();
   var response =
-      await rootDirectory.ptr.openDirectory(systemTempPath,
-                                            _systemTempDirectory,
-                                            flags);
+      await rootDirectory.openDirectory(systemTempPath,
+                                        _systemTempDirectory,
+                                        flags);
   assert(response.error == types.Error.ok);
   // Remove the system temp directory's handle from the open set because it
   // is not under application control and does not affect isolate shutdown.
-  _systemTempDirectory.impl.endpoint.handle.pass();
+  _systemTempDirectory.ctrl.endpoint.handle.pass();
   return _systemTempDirectory;
 }
 
 /// Static utility methods for converting between 'dart:io' and
 /// 'mojo:network_service' structs.
 class _NetworkServiceCodec {
   /// Returns a string representation of an ip address encoded in [address].
   /// Supports both IPv4 and IPv6.
   static String _addressToString(List<int> address) {
     String r = '';
@@ skipping 111 matching lines @@
   }
 
   static _throwOnError(NetworkError error) {
     if (_okay(error)) {
       return;
     }
     throw new OSError(error.description, error.code);
   }
 }