Use the new loader mechanism to resolve URIs and load script files in gen_snapshot. This should all…

runtime/bin/vmservice/loader.dart

 // Copyright (c) 2015, the Dart project authors.  Please see the AUTHORS file
 // for details. 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 vmservice_io;
 
 _sanitizeWindowsPath(path) {
   // For Windows we need to massage the paths a bit according to
   // http://blogs.msdn.com/b/ie/archive/2006/12/06/file-uris-in-windows.aspx
   //
@@ skipping 462 matching lines @@
 
 // TODO(johnmccutchan): This and most other top level functions in this file
 // should be turned into methods on the IsolateLoaderState class.
 _handleResourceRequest(IsolateLoaderState loaderState,
                        SendPort sp,
                        bool traceLoading,
                        int tag,
                        Uri uri,
                        Uri resolvedUri,
                        String libraryUrl) {
-  if (resolvedUri.scheme == 'file') {
+  if (resolvedUri.scheme == '' || resolvedUri.scheme == 'file') {
     _loadFile(sp, tag, uri, resolvedUri, libraryUrl);
   } else if ((resolvedUri.scheme == 'http') ||
              (resolvedUri.scheme == 'https')) {
     _loadHttp(sp, tag, uri, resolvedUri, libraryUrl);
   } else if ((resolvedUri.scheme == 'data')) {
     _loadDataUri(sp, tag, uri, resolvedUri, libraryUrl);
   } else if ((resolvedUri.scheme == 'package')) {
     _loadPackage(loaderState,
                  sp,
                  traceLoading,
@@ skipping 304 matching lines @@
 // This code used to exist in a second isolate and so it uses a SendPort to
 // report it's return value. This could be refactored so that it returns it's
 // value and the caller could wait on the future rather than a message on
 // SendPort.
 _handlePackagesRequest(SendPort sp,
                        bool traceLoading,
                        int tag,
                        Uri resource) async {
   try {
     if (tag == -1) {
-      if (resource.scheme == 'file') {
+      if (resource.scheme == '' || resource.scheme == 'file') {
         _findPackagesFile(sp, traceLoading, resource);
       } else if ((resource.scheme == 'http') || (resource.scheme == 'https')) {
         // Try to load the .packages file next to the resource.
         var packagesUri = resource.resolve(".packages");
         var exists = await _loadHttpPackagesFile(sp, traceLoading, packagesUri);
         if (!exists) {
           // If the loading of the .packages file failed for http/https based
           // scripts then setup the package root.
           var packageRoot = resource.resolve('packages/');
           sp.send([packageRoot.toString()]);
         }
       } else {
         sp.send("Unsupported scheme used to locate .packages file: "
                 "'$resource'.");
       }
     } else if (tag == -2) {
       if (traceLoading) {
         _log("Handling load of packages map: '$resource'.");
       }
-      if (resource.scheme == 'file') {
+      if (resource.scheme == '' || resource.scheme == 'file') {
         var exists = await new File.fromUri(resource).exists();
         if (exists) {
           _loadPackagesFile(sp, traceLoading, resource);
         } else {
           sp.send("Packages file '$resource' not found.");
         }
       } else if ((resource.scheme == 'http') || (resource.scheme == 'https')) {
         var exists = await _loadHttpPackagesFile(sp, traceLoading, resource);
         if (!exists) {
           sp.send("Packages file '$resource' not found.");
@@ skipping 148 matching lines @@
           }
           resolvedUri = null;
         }
         sp.send(resolvedUri);
       });
     break;
     default:
       _log('Unknown loader request tag=$tag from $isolateId');
   }
 }