Use the new loader mechanism to resolve URIs and load script files in gen_snapshot. This should all…

runtime/bin/dartutils.h

Index: runtime/bin/dartutils.h
diff --git a/runtime/bin/dartutils.h b/runtime/bin/dartutils.h
index 9c3bc72c0e9811c8c58b2d0a6450319930b8007f..ed197da0e70519774af97ae873258eb0f200b90a 100644
--- a/runtime/bin/dartutils.h
+++ b/runtime/bin/dartutils.h
@@ -194,12 +194,8 @@ class DartUtils {
 
   static bool SetOriginalWorkingDirectory();
 
-  static const char* MapLibraryUrl(CommandLineOptions* url_mapping,
-                                   const char* url_string);
+  static const char* MapLibraryUrl(const char* url_string);
 
-  static Dart_Handle ResolveUriInWorkingDirectory(Dart_Handle script_uri);
-  static Dart_Handle FilePathFromUri(Dart_Handle script_uri);
-  static Dart_Handle ResolveUri(Dart_Handle library_url, Dart_Handle url);
   static Dart_Handle ResolveScript(Dart_Handle url);
 
   // Sniffs the specified text_buffer to see if it contains the magic number
@@ -217,6 +213,9 @@ class DartUtils {
   // Global state that stores the original working directory..
   static const char* original_working_directory;
 
+  // Global state that captures the URL mappings specified on the command line.
+  static CommandLineOptions* url_mapping;
+
   static const char* const kDartScheme;
   static const char* const kDartExtensionScheme;
   static const char* const kAsyncLibURL;