HTTP loading tests and package root support

runtime/bin/dartutils.cc

 // Copyright (c) 2012, 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.
 
 #include "bin/dartutils.h"
 
 #include "include/dart_api.h"
 
 #include "platform/assert.h"
 #include "platform/globals.h"
@@ skipping 545 matching lines @@
     if (Dart_IsError(source)) {
       return source;
     }
     return Dart_LoadScript(uri, source, 0, 0);
   }
 }
 
 
 Dart_Handle DartUtils::LoadScript(const char* script_uri,
                                   Dart_Handle builtin_lib) {
-  if (DartUtils::IsHttpSchemeURL(script_uri)) {
-    return LoadScriptHttp(NewString(script_uri), builtin_lib);
-  }
-  Dart_Handle resolved_script_uri;
-  resolved_script_uri = ResolveScriptUri(NewString(script_uri), builtin_lib);
+  // Always call ResolveScriptUri because as a side effect it sets
+  // the script entry path which is used when automatically resolving
+  // package root.
+  Dart_Handle 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(resolved_script_uri, builtin_lib);
+  }
   Dart_Handle script_path = DartUtils::FilePathFromUri(resolved_script_uri,
                                                        builtin_lib);
   if (Dart_IsError(script_path)) {
     return script_path;
   }
   const char* script_path_cstr;
   Dart_StringToCString(script_path, &script_path_cstr);
   const char* error_msg = NULL;
   intptr_t len;
   const uint8_t* text_buffer = ReadFileFully(script_path_cstr,
@@ skipping 369 matching lines @@
       new CObjectString(CObject::NewString(os_error->message()));
   CObjectArray* result = new CObjectArray(CObject::NewArray(3));
   result->SetAt(0, new CObjectInt32(CObject::NewInt32(kOSError)));
   result->SetAt(1, new CObjectInt32(CObject::NewInt32(os_error->code())));
   result->SetAt(2, error_message);
   return result;
 }
 
 }  // namespace bin
 }  // namespace dart