Rename Builtin::LoadLibrary to Builtin::LoadAndCheckLibrary as the name

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 "bin/extensions.h"
 #include "bin/directory.h"
 #include "bin/file.h"
 #include "include/dart_api.h"
@@ skipping 261 matching lines @@
   }
   bool is_dart_scheme_url = DartUtils::IsDartSchemeURL(url_string);
   bool is_dart_extension_url = DartUtils::IsDartExtensionSchemeURL(url_string);
   if (tag == kCanonicalizeUrl) {
     // If this is a Dart Scheme URL then it is not modified as it will be
     // handled by the VM internally.
     if (is_dart_scheme_url) {
       return url;
     }
     // Resolve the url within the context of the library's URL.
-    Dart_Handle builtin_lib = Builtin::LoadLibrary(Builtin::kBuiltinLibrary);
+    Dart_Handle builtin_lib =
+        Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
     Dart_Handle library_url = Dart_LibraryUrl(library);
     if (Dart_IsError(library_url)) {
       return library_url;
     }
     const int kNumArgs = 2;
     Dart_Handle dart_args[kNumArgs];
     dart_args[0] = library_url;
     dart_args[1] = url;
     return Dart_Invoke(
         builtin_lib, Dart_NewString("_resolveUri"), kNumArgs, dart_args);
@@ skipping 10 matching lines @@
       id = Builtin::kJsonLibrary;
     } else if (DartUtils::IsDartUriLibURL(url_string)) {
       id = Builtin::kUriLibrary;
     } else if (DartUtils::IsDartUtfLibURL(url_string)) {
       id = Builtin::kUtfLibrary;
     } else if (DartUtils::IsDartWebLibURL(url_string)) {
       id = Builtin::kWebLibrary;
     } else {
       return Dart_Error("Do not know how to load '%s'", url_string);
     }
-    return Builtin::LoadLibrary(id);
+    return Builtin::LoadAndCheckLibrary(id);
   } else {
     // Get the file path out of the url.
-    Dart_Handle builtin_lib = Builtin::LoadLibrary(Builtin::kBuiltinLibrary);
+    Dart_Handle builtin_lib =
+        Builtin::LoadAndCheckLibrary(Builtin::kBuiltinLibrary);
     Dart_Handle file_path = FilePathFromUri(url, builtin_lib);
     if (Dart_IsError(file_path)) {
       return file_path;
     }
     Dart_StringToCString(file_path, &url_string);
   }
   if (is_dart_extension_url) {
     if (tag != kImportTag) {
       return Dart_Error("Dart extensions must use import: '%s'", url_string);
     }
@@ skipping 77 matching lines @@
   // Setup the corelib 'print' function.
   Dart_Handle print =
       Dart_Invoke(builtin_lib, Dart_NewString("_getPrintClosure"), 0, 0);
   Dart_Handle coreimpl = Dart_LookupLibrary(Dart_NewString("dart:coreimpl"));
   Dart_Handle print_impl =
       Dart_GetClass(coreimpl, Dart_NewString("PrintImplementation"));
   Dart_Handle result = Dart_SetField(print_impl,
                                      Dart_NewString("_printClosure"), print);
 
   // Setup the IO library.
-  Dart_Handle io_lib = Builtin::LoadLibrary(Builtin::kIOLibrary);
+  Dart_Handle io_lib = Builtin::LoadAndCheckLibrary(Builtin::kIOLibrary);
   Builtin::SetupIOLibrary(io_lib);
 
   // Set up package root if specified.
   if (package_root != NULL) {
     result = Dart_NewString(package_root);
     if (!Dart_IsError(result)) {
       const int kNumArgs = 1;
       Dart_Handle dart_args[kNumArgs];
       dart_args[0] = result;
       return Dart_Invoke(builtin_lib,
@@ skipping 233 matching lines @@
 
 CObject* CObject::NewOSError(OSError* os_error) {
   CObject* error_message =
       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;
 }