[dart:io] Move _getUriBaseClosure to dart:io

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/crypto.h"
 #include "bin/directory.h"
 #include "bin/extensions.h"
 #include "bin/file.h"
@@ skipping 361 matching lines @@
                                         snapshot_magic_number.length);
   ASSERT(bytes_written);
 }
 
 void DartUtils::SkipSnapshotMagicNumber(const uint8_t** buffer,
                                         intptr_t* buffer_length) {
   *buffer += snapshot_magic_number.length;
   *buffer_length -= snapshot_magic_number.length;
 }
 
-void FUNCTION_NAME(Builtin_GetCurrentDirectory)(Dart_NativeArguments args) {
-  const char* current = Directory::Current();
-  if (current != NULL) {
-    Dart_SetReturnValue(args, DartUtils::NewString(current));
-  } else {
-    Dart_Handle err = DartUtils::NewError("Failed to get current directory.");
-    Dart_PropagateError(err);
-  }
-}
-
 Dart_Handle DartUtils::PrepareBuiltinLibrary(Dart_Handle builtin_lib,
                                              Dart_Handle internal_lib,
                                              bool is_service_isolate,
                                              bool trace_loading) {
   // Setup the internal library's 'internalPrint' function.
   Dart_Handle print =
       Dart_Invoke(builtin_lib, NewString("_getPrintClosure"), 0, NULL);
   RETURN_IF_ERROR(print);
   Dart_Handle result =
       Dart_SetField(internal_lib, NewString("_printClosure"), print);
@@ skipping 10 matching lines @@
       RETURN_IF_ERROR(result);
     }
     // Set current working directory.
     result = SetWorkingDirectory();
     RETURN_IF_ERROR(result);
   }
   return Dart_True();
 }
 
 Dart_Handle DartUtils::PrepareCoreLibrary(Dart_Handle core_lib,
-                                          Dart_Handle builtin_lib,
+                                          Dart_Handle io_lib,
                                           bool is_service_isolate) {
   if (!is_service_isolate) {
     // Setup the 'Uri.base' getter in dart:core.
     Dart_Handle uri_base =
-        Dart_Invoke(builtin_lib, NewString("_getUriBaseClosure"), 0, NULL);
+        Dart_Invoke(io_lib, NewString("_getUriBaseClosure"), 0, NULL);
     RETURN_IF_ERROR(uri_base);
     Dart_Handle result =
         Dart_SetField(core_lib, NewString("_uriBaseClosure"), uri_base);
     RETURN_IF_ERROR(result);
   }
   return Dart_True();
 }
 
 Dart_Handle DartUtils::PrepareAsyncLibrary(Dart_Handle async_lib,
                                            Dart_Handle isolate_lib) {
@@ skipping 87 matching lines @@
   // We need to ensure that all the scripts loaded so far are finalized
   // as we are about to invoke some Dart code below to setup closures.
   Dart_Handle result = Dart_FinalizeLoading(false);
   RETURN_IF_ERROR(result);
 
   result = PrepareBuiltinLibrary(builtin_lib, internal_lib, is_service_isolate,
                                  trace_loading);
   RETURN_IF_ERROR(result);
 
   RETURN_IF_ERROR(PrepareAsyncLibrary(async_lib, isolate_lib));
-  RETURN_IF_ERROR(
-      PrepareCoreLibrary(core_lib, builtin_lib, is_service_isolate));
+  RETURN_IF_ERROR(PrepareCoreLibrary(core_lib, io_lib, is_service_isolate));
   RETURN_IF_ERROR(PrepareIsolateLibrary(isolate_lib));
   RETURN_IF_ERROR(PrepareIOLibrary(io_lib));
   return result;
 }
 
 Dart_Handle DartUtils::SetupIOLibrary(const char* script_uri) {
   Dart_Handle io_lib_url = NewString(kIOLibURL);
   RETURN_IF_ERROR(io_lib_url);
   Dart_Handle io_lib = Dart_LookupLibrary(io_lib_url);
   RETURN_IF_ERROR(io_lib);
@@ skipping 413 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