Fix build. Fix tests.

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 328 matching lines @@
   msg[3] = libraryUrl;
   msg[4] = data;
   sp.send(msg);
 }
 
 // Send a response to the requesting isolate.
 void _sendExtensionImportResponse(SendPort sp,
                                   Uri uri,
                                   String libraryUrl,
                                   String resolvedUri) {
-  var msg = new List(4);
+  var msg = new List(5);
   int tag = _Dart_kImportExtension;
   if (resolvedUri == null) {
     // We could not resolve the dart-ext: uri.
     tag = -tag;
     resolvedUri = 'Could not resolve "$uri" from "$libraryUrl"';
   }
   msg[0] = tag;
   msg[1] = uri.toString();
-  msg[2] = libraryUrl;
-  msg[3] = resolvedUri;
+  msg[2] = resolvedUri;
+  msg[3] = libraryUrl;
+  msg[4] = resolvedUri;
   sp.send(msg);
 }
 
 void _loadHttp(SendPort sp,
                int tag,
                Uri uri,
                Uri resolvedUri,
                String libraryUrl) {
   if (_httpClient == null) {
     _httpClient = new HttpClient()..maxConnectionsPerHost = 6;
@@ skipping 695 matching lines @@
             _log('Unknown scheme (${pathUri.scheme}) in $pathUri.');
           }
           _sendExtensionImportResponse(sp, uri, libraryUri, null);
         break;
       }
     break;
     default:
       _log('Unknown loader request tag=$tag from $isolateId');
   }
 }