Change Dart_DefaultCanonicalizeUrl to accept the library url string instead of a library, this is u…

runtime/vm/unit_test.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 "vm/unit_test.h"
 
 #include <stdio.h>
 
 #include "bin/builtin.h"
 #include "bin/dartutils.h"
@@ skipping 122 matching lines @@
                      dart_args);
 }
 
 
 static ThreadLocalKey script_reload_key = kUnsetThreadLocalKey;
 
 static Dart_Handle LibraryTagHandler(Dart_LibraryTag tag,
                                      Dart_Handle library,
                                      Dart_Handle url) {
   if (tag == Dart_kCanonicalizeUrl) {
-    return Dart_DefaultCanonicalizeUrl(library, url);
+    Dart_Handle library_url = Dart_LibraryUrl(library);
+    if (Dart_IsError(library_url)) {
+      return library_url;
+    }
+    return Dart_DefaultCanonicalizeUrl(library_url, url);
   }
   if (tag == Dart_kScriptTag) {
     // Reload request.
     ASSERT(script_reload_key != kUnsetThreadLocalKey);
     const char* script_source =
        reinterpret_cast<const char*>(
            OSThread::GetThreadLocal(script_reload_key));
     ASSERT(script_source != NULL);
     OSThread::SetThreadLocal(script_reload_key, 0);
     return Dart_LoadScript(url,
@@ skipping 293 matching lines @@
   }
   // Copy the remainder of in to out.
   while (*in != '\0') {
     *out++ = *in++;
   }
   *out = '\0';
 }
 
 
 }  // namespace dart