Resubmit change 7506.

bin/main.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 <stdlib.h>
 #include <string.h>
 #include <stdio.h>
 
 #include "include/dart_api.h"
 #include "include/dart_debugger_api.h"
@@ skipping 411 matching lines @@
       *map_name = '\0';
       map_name += 1;
       Dart_ListSetAt(import_map, index, Dart_NewString(name));
       Dart_ListSetAt(import_map, (index + 1), Dart_NewString(map_name));
     } else {
       Dart_ListSetAt(import_map, index, Dart_NewString(name));
       Dart_ListSetAt(import_map, (index + 1), Dart_NewString(""));
     }
     free(name);
   }
-  return Dart_LoadScript(script_url, source, LibraryTagHandler, import_map);
+  return Dart_LoadScript(script_url, source, import_map);
 }
 
 
 // Returns true on success, false on failure.
 static bool CreateIsolateAndSetup(const char* name_prefix,
                                   void* data, char** error) {
   Dart_Isolate isolate =
       Dart_CreateIsolate(name_prefix, snapshot_buffer, data, error);
   if (isolate == NULL) {
     return false;
   }
 
   Dart_EnterScope();
 
   if (snapshot_buffer != NULL) {
     // Setup the native resolver as the snapshot does not carry it.
     Builtin::SetNativeResolver(Builtin::kBuiltinLibrary);
     Builtin::SetNativeResolver(Builtin::kIOLibrary);
   }
 
+  // Set up the library tag handler for this isolate.
+  Dart_Handle result = Dart_SetLibraryTagHandler(LibraryTagHandler);
+  if (Dart_IsError(result)) {
+    *error = strdup(Dart_GetError(result));
+    return false;
+  }
+
   // Prepare builtin and its dependent libraries for use to resolve URIs.
   Dart_Handle uri_lib = Builtin::LoadLibrary(Builtin::kUriLibrary);
   if (Dart_IsError(uri_lib)) {
     *error = strdup(Dart_GetError(uri_lib));
     return false;
   }
   Dart_Handle builtin_lib = Builtin::LoadLibrary(Builtin::kBuiltinLibrary);
   if (Dart_IsError(builtin_lib)) {
     *error = strdup(Dart_GetError(builtin_lib));
     return false;
   }
-  Dart_Handle library = Dart_LibraryImportLibrary(builtin_lib, uri_lib);
-  if (Dart_IsError(library)) {
-    *error = strdup(Dart_GetError(library));
-    return false;
-  }
 
   if (package_root != NULL) {
     Dart_Handle dart_args[1];
 
     Dart_Handle handle = Dart_NewString(package_root);
     if (Dart_IsError(handle)) {
       *error = strdup(Dart_GetError(handle));
       return false;
     }
     dart_args[0] = handle;
 
     Dart_Handle result = Dart_Invoke(builtin_lib,
         Dart_NewString("_setPackageRoot"), 1, dart_args);
     if (Dart_IsError(result)) {
       *error = strdup(Dart_GetError(result));
       return false;
     }
   }
 
   // Load the specified application script into the newly created isolate.
-  library = LoadScript(builtin_lib, import_map_options);
+  Dart_Handle library = LoadScript(builtin_lib, import_map_options);
   if (Dart_IsError(library)) {
     *error = strdup(Dart_GetError(library));
     Dart_ExitScope();
     Dart_ShutdownIsolate();
     return false;
   }
   if (!Dart_IsLibrary(library)) {
     char errbuf[256];
     snprintf(errbuf, sizeof(errbuf),
              "Expected a library when loading script: %s",
@@ skipping 193 matching lines @@
   Dart_ShutdownIsolate();
   // Terminate process exit-code handler.
   Process::TerminateExitCodeHandler();
 
   free(const_cast<char*>(original_script_name));
   free(const_cast<char*>(original_working_directory));
   free(const_cast<char*>(original_script_url));
 
   return 0;
 }