Revert my last change.

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 <stdio.h>
 
 #include "vm/unit_test.h"
 
 #include "bin/builtin.h"
 #include "bin/dartutils.h"
@@ skipping 30 matching lines @@
   TestCaseBase* test = first_;
   while (test != NULL) {
     test->RunTest();
     test = test->next_;
   }
 }
 
 
 static Dart_Handle LibraryTagHandler(Dart_LibraryTag tag,
                                      Dart_Handle library,
-                                     Dart_Handle url) {
+                                     Dart_Handle url,
+                                     Dart_Handle import_map) {
   if (!Dart_IsLibrary(library)) {
     return Dart_Error("not a library");
   }
   if (!Dart_IsString8(url)) {
     return Dart_Error("url is not a string");
   }
   const char* url_chars = NULL;
   Dart_Handle result = Dart_StringToCString(url, &url_chars);
   if (Dart_IsError(result)) {
     return Dart_Error("accessing url characters failed");
@@ skipping 23 matching lines @@
     } else if (DartUtils::IsDartCryptoLibURL(url_chars)) {
       return Builtin::LoadLibrary(Builtin::kCryptoLibrary);
     } else {
       return Dart_Error("Do not know how to load '%s'", url_chars);
     }
   }
   result = DartUtils::LoadSource(NULL,
                                  library,
                                  url,
                                  tag,
-                                 url_chars);
+                                 url_chars,
+                                 import_map);
   if (!Dart_IsError(result) && (tag == kImportTag)) {
     Builtin::ImportLibrary(result, Builtin::kBuiltinLibrary);
   }
   return result;
 }
 
 
 Dart_Handle TestCase::LoadTestScript(const char* script,
                                      Dart_NativeEntryResolver resolver,
                                      Dart_Handle import_map) {
   Dart_Handle url = Dart_NewString(TestCase::url());
   Dart_Handle source = Dart_NewString(script);
   Dart_Handle result = Dart_SetLibraryTagHandler(LibraryTagHandler);
   EXPECT_VALID(result);
-  result = Dart_SetImportMap(import_map);
-  EXPECT_VALID(result);
-  Dart_Handle lib = Dart_LoadScript(url, source);
+  Dart_Handle lib = Dart_LoadScript(url, source, import_map);
   DART_CHECK_VALID(lib);
   result = Dart_SetNativeResolver(lib, resolver);
   DART_CHECK_VALID(result);
   return lib;
 }
 
 
 Dart_Handle TestCase::lib() {
   Dart_Handle url = Dart_NewString(TestCase::url());
   Dart_Handle lib = Dart_LookupLibrary(url);
   DART_CHECK_VALID(lib);
   ASSERT(Dart_IsLibrary(lib));
   return lib;
 }
 
 
 Dart_Handle TestCase::library_handler(Dart_LibraryTag tag,
                                       Dart_Handle library,
-                                      Dart_Handle url) {
+                                      Dart_Handle url,
+                                      Dart_Handle import_map) {
   if (tag == kCanonicalizeUrl) {
     return url;
   }
   return Api::Success(Isolate::Current());
 }
 
 
 uword AssemblerTest::Assemble() {
   const String& function_name = String::ZoneHandle(String::NewSymbol(name_));
   Function& function = Function::ZoneHandle(
@@ skipping 74 matching lines @@
 
 bool CompilerTest::TestCompileFunction(const Function& function) {
   Isolate* isolate = Isolate::Current();
   ASSERT(isolate != NULL);
   ASSERT(ClassFinalizer::AllClassesFinalized());
   const Error& error = Error::Handle(Compiler::CompileFunction(function));
   return error.IsNull();
 }
 
 }  // namespace dart