HTTP loading tests and package root support

runtime/bin/dartutils.cc

Index: runtime/bin/dartutils.cc
diff --git a/runtime/bin/dartutils.cc b/runtime/bin/dartutils.cc
index 9e263051f57bf8a9a48ac5da8d328f3cc120d94a..a640bb4be8043d73d452fae648d8ba2026d689e2 100644
--- a/runtime/bin/dartutils.cc
+++ b/runtime/bin/dartutils.cc
@@ -401,7 +401,7 @@ static Dart_Handle ParseHttpUri(const char* script_uri, const char** host_str,
   if (Dart_IsError(path)) {
     return path;
   }
-  Dart_Handle host = DartUtils::DomainFromUri(uri, builtin_lib);
+  Dart_Handle host = DartUtils::HostFromUri(uri, builtin_lib);
   if (Dart_IsError(host)) {
     return host;
   }
@@ -526,9 +526,9 @@ Dart_Handle DartUtils::PathFromUri(Dart_Handle script_uri,
 }
 
 
-Dart_Handle DartUtils::DomainFromUri(Dart_Handle script_uri,
-                                     Dart_Handle builtin_lib) {
-  return SingleArgDart_Invoke(script_uri, builtin_lib, "_domainFromHttpUri");
+Dart_Handle DartUtils::HostFromUri(Dart_Handle script_uri,
+                                   Dart_Handle builtin_lib) {
+  return SingleArgDart_Invoke(script_uri, builtin_lib, "_hostFromHttpUri");
 }
 
 
@@ -713,14 +713,16 @@ Dart_Handle DartUtils::LoadScriptHttp(const char* script_uri,
 
 Dart_Handle DartUtils::LoadScript(const char* script_uri,
                                   Dart_Handle builtin_lib) {
-  if (DartUtils::IsHttpSchemeURL(script_uri)) {
-    return LoadScriptHttp(script_uri, builtin_lib);
-  }
   Dart_Handle resolved_script_uri;
+  // Always call ResolveScriptUri so that the base path is set.
   resolved_script_uri = ResolveScriptUri(NewString(script_uri), builtin_lib);
   if (Dart_IsError(resolved_script_uri)) {
     return resolved_script_uri;
   }
+  // Handle http: requests separately.
+  if (DartUtils::IsHttpSchemeURL(script_uri)) {
+    return LoadScriptHttp(script_uri, builtin_lib);
+  }
   Dart_Handle script_path = DartUtils::FilePathFromUri(resolved_script_uri,
                                                        builtin_lib);
   if (Dart_IsError(script_path)) {