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

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 "bin/isolate_data.h"
 #include "include/dart_api.h"
 #include "include/dart_native_api.h"
@@ skipping 176 matching lines @@
   static Dart_Handle NewInternalError(const char* message);
 
   static Dart_Handle BuiltinLib() {
     IsolateData* isolate_data =
         reinterpret_cast<IsolateData*>(Dart_CurrentIsolateData());
     return isolate_data->builtin_lib();
   }
 
   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
   // representing a script snapshot. If the text_buffer is a script snapshot
   // the return value is an updated pointer to the text_buffer pointing past
   // the magic number value. The 'buffer_len' parameter is also appropriately
   // adjusted.
   static const uint8_t* SniffForMagicNumber(const uint8_t* text_buffer,
                                             intptr_t* buffer_len,
                                             bool* is_snapshot);
 
   // Write a magic number to indicate a script snapshot file.
   static void WriteMagicNumber(File* file);
 
   // 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;
   static const char* const kBuiltinLibURL;
   static const char* const kCoreLibURL;
   static const char* const kInternalLibURL;
   static const char* const kIsolateLibURL;
   static const char* const kIOLibURL;
   static const char* const kIOLibPatchURL;
   static const char* const kUriLibURL;
@@ skipping 435 matching lines @@
   bool is_typed_data_;
 
   DISALLOW_ALLOCATION();
   DISALLOW_COPY_AND_ASSIGN(ScopedMemBuffer);
 };
 
 }  // namespace bin
 }  // namespace dart
 
 #endif  // BIN_DARTUTILS_H_