Add data-URI support class to dart:core (next to Uri).

runtime/bin/dartutils.cc

Index: runtime/bin/dartutils.cc
diff --git a/runtime/bin/dartutils.cc b/runtime/bin/dartutils.cc
index 3c16a0ef7fc69b3844bf91f8f70b122062d01674..534eba857cbf3463e739e571f408614569cd5ca4 100644
--- a/runtime/bin/dartutils.cc
+++ b/runtime/bin/dartutils.cc
@@ -749,15 +749,15 @@ Dart_Handle DartUtils::PrepareBuiltinLibrary(Dart_Handle builtin_lib,
 }
 
 
-Dart_Handle DartUtils::PrepareCoreLibrary(Dart_Handle core_lib,
-                                          Dart_Handle builtin_lib,
-                                          bool is_service_isolate) {
+Dart_Handle DartUtils::PrepareUriLibrary(Dart_Handle uri_lib,
+                                         Dart_Handle builtin_lib,
+                                         bool is_service_isolate) {
   if (!is_service_isolate) {
-    // Setup the 'Uri.base' getter in dart:core.
+    // Setup the 'Uri.base' getter in dart:uri.
     Dart_Handle uri_base = Dart_Invoke(
         builtin_lib, NewString("_getUriBaseClosure"), 0, NULL);
     RETURN_IF_ERROR(uri_base);
-    Dart_Handle result = Dart_SetField(core_lib,
+    Dart_Handle result = Dart_SetField(uri_lib,
                                        NewString("_uriBaseClosure"),
                                        uri_base);
     RETURN_IF_ERROR(result);
@@ -814,6 +814,10 @@ Dart_Handle DartUtils::PrepareForScriptLoading(const char* package_root,
   RETURN_IF_ERROR(internal_lib);
   Dart_Handle io_lib = Builtin::LoadAndCheckLibrary(Builtin::kIOLibrary);
   RETURN_IF_ERROR(io_lib);
+  url = NewString(kUriLibURL);
+  RETURN_IF_ERROR(url);
+  Dart_Handle uri_lib = Dart_LookupLibrary(url);
+  RETURN_IF_ERROR(uri_lib);
 
   // 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.
@@ -830,8 +834,8 @@ Dart_Handle DartUtils::PrepareForScriptLoading(const char* package_root,
   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(PrepareUriLibrary(
+      uri_lib, builtin_lib, is_service_isolate));
   RETURN_IF_ERROR(PrepareIsolateLibrary(isolate_lib));
   RETURN_IF_ERROR(PrepareIOLibrary(io_lib));
   return result;