Change dart:io Platform.script to return a URI. Change all uses of Platform.script to work with th…

tests/standalone/http_launch_test.dart

 // Copyright (c) 2013, 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.
 // VMOptions=
 // VMOptions=--short_socket_read
 // VMOptions=--short_socket_write
 // VMOptions=--short_socket_read --short_socket_write
 //
 // Test:
 //   *) Launching a script fetched over HTTP.
 //   *) Importing a library fetched over HTTP.
 //   *) Automatically resolving package_root when script is fetched over HTTP.
 //   *) Spawning a URI over HTTP.
 
 library http_launch_test;
 
 import 'dart:async';
 import 'dart:io';
 import 'package:expect/expect.dart';
 
 String pathToExecutable = Platform.executable;
-String pathOfData = new File(Platform.script).parent.path +
-                    '/http_launch_data';
+Uri pathOfData = Platform.script.resolve('http_launch_data/');
 int port;
 
 _sendNotFound(HttpResponse response) {
   response.statusCode = HttpStatus.NOT_FOUND;
   response.close();
 }
 
 handleRequest(HttpRequest request) {
-  final String path = request.uri.path;
-  final String requestPath = '$pathOfData$path';
-  final File file = new File(requestPath);
+  final String path = request.uri.path.substring(1);
+  final Uri requestPath = pathOfData.resolve(path);
+  final File file = new File(requestPath.toFilePath());
   file.exists().then((bool found) {
     if (found) {
       file.openRead()
           .pipe(request.response)
           .catchError((e) { _sendNotFound(request.response); });
     } else {
       _sendNotFound(request.response);
     }
   });
 }
 
 serverRunning(HttpServer server) {
   port = server.port;
   server.listen(handleRequest);
   Future<ProcessResult> no_http_run =
-      Process.run(pathToExecutable, ['${pathOfData}/http_launch_main.dart']);
+    Process.run(pathToExecutable,
+                [pathOfData.resolve('http_launch_main.dart').toFilePath()]);
   Future<ProcessResult> http_run =
     Process.run(pathToExecutable,
                 ['http://127.0.0.1:$port/http_launch_main.dart']);
   Future<ProcessResult> http_pkg_root_run =
     Process.run(pathToExecutable,
                 ['--package-root=http://127.0.0.1:$port/packages/',
                 'http://127.0.0.1:$port/http_launch_main.dart']);
   Future<ProcessResult> isolate_run =
     Process.run(pathToExecutable,
                 ['http://127.0.0.1:$port/http_spawn_main.dart', '$port']);
@@ skipping 20 matching lines @@
   Expect.isTrue(stdout.startsWith('hello'));
   // Same output from all three process runs.
   for (int i = 0; i < results.length; i++) {
     Expect.equals(stdout, results[i].stdout);
   }
 }
 
 main() {
   HttpServer.bind(InternetAddress.LOOPBACK_IP_V4, 0).then(serverRunning);
 }