Reland r45669:

runtime/bin/dartutils.h

 // 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.
 
 #ifndef BIN_DARTUTILS_H_
 #define BIN_DARTUTILS_H_
 
 #include "include/dart_api.h"
 #include "include/dart_native_api.h"
 
@@ skipping 163 matching lines @@
   static Dart_Handle NewError(const char* format, ...);
   static Dart_Handle NewInternalError(const char* message);
 
   static bool SetOriginalWorkingDirectory();
 
   static const char* MapLibraryUrl(CommandLineOptions* url_mapping,
                                    const char* url_string);
 
   static Dart_Handle SetWorkingDirectory(Dart_Handle builtin_lib);
 
-  static Dart_Handle ResolveScriptUri(Dart_Handle script_uri,
-                                      Dart_Handle builtin_lib);
+  static Dart_Handle ResolveUriInWorkingDirectory(Dart_Handle script_uri,
+                                                  Dart_Handle builtin_lib);
 
   static Dart_Handle FilePathFromUri(Dart_Handle script_uri,
                                      Dart_Handle builtin_lib);
 
   static Dart_Handle ExtensionPathFromUri(Dart_Handle extension_uri,
                                           Dart_Handle builtin_lib);
 
   static Dart_Handle ResolveUri(Dart_Handle library_url,
                                 Dart_Handle url,
                                 Dart_Handle builtin_lib);
@@ skipping 383 matching lines @@
 
   ~ScopedBlockingCall() {
     Dart_IsolateUnblocked();
   }
 };
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // BIN_DARTUTILS_H_