Dart: Renames dart:mojo_blah -> mojo:blah

This improves consistency with the convention that the dart: scheme is
only for things from the Dart standard library.

BUG=
R=erg@chromium.org

Review URL: https://codereview.chromium.org/951783004

engine/bindings/BUILD.gn

@@ -102,8 +102,8 @@ action("generate_snapshot_bin") {
     "--target_os",
     os,
     "--url_mapping=dart:sky,$sky_core_path",
-    "--url_mapping=dart:mojo_bindings,$mojo_bindings_path",
-    "--url_mapping=dart:mojo_core,$mojo_core_path",
+    "--url_mapping=mojo:bindings,$mojo_bindings_path",
+    "--url_mapping=mojo:core,$mojo_core_path",
     "--url_mapping=dart:sky_builtin,$builtin_path",
   ]
 }

engine/bindings/builtin.cc

@@ -27,8 +27,8 @@ const LibraryDescriptor kBuiltinLibraries[] = {
     /* { url_, has_natives_, native_symbol_, native_resolver_ } */
     {"dart:sky_builtin", true, BuiltinNatives::NativeSymbol, BuiltinNatives::NativeLookup},
     {"dart:sky", true, skySnapshotSymbolizer, skySnapshotResolver},
-    {"dart:mojo_bindings", false, nullptr, nullptr},
-    {"dart:mojo_core", true, MojoNativeSymbol, MojoNativeLookup},
+    {"mojo:bindings", false, nullptr, nullptr},
+    {"mojo:core", true, MojoNativeSymbol, MojoNativeLookup},
 };
 
 }  // namespace

engine/bindings/mojo_natives.cc

@@ -99,7 +99,7 @@ static void SetInvalidArgumentReturn(Dart_NativeArguments arguments) {
 }
 
 static Dart_Handle MojoLib() {
-  return DartBuiltin::LookupLibrary("dart:mojo_core");
+  return DartBuiltin::LookupLibrary("mojo:core");
 }
 
 static Dart_Handle SignalsStateToDart(Dart_Handle klass,

engine/bindings/snapshot.dart

@@ -9,8 +9,8 @@ import 'dart:core';
 import 'dart:isolate';
 import 'dart:math';
 import 'dart:mirrors';
-import 'dart:mojo_bindings';
-import 'dart:mojo_core';
 import 'dart:sky';
 import 'dart:sky_builtin';
 import 'dart:typed_data';
+import 'mojo:bindings';
+import 'mojo:core';

engine/core/script/dart_loader.cc

@@ -26,7 +26,7 @@ Dart_Handle CanonicalizeURL(DartState* state,
                             Dart_Handle library,
                             Dart_Handle url) {
   String string = StringFromDart(url);
-  if (string.startsWith("dart:"))
+  if (string.startsWith("dart:") || string.startsWith("mojo:"))
     return url;
   // TODO(dart): Figure out how 'package:' should work in sky.
   if (string.startsWith("package:")) {
@@ -194,6 +194,14 @@ Dart_Handle DartLoader::HandleLibraryTag(Dart_LibraryTag tag,
     return CanonicalizeURL(DartState::Current(), library, url);
   if (tag == Dart_kImportTag) {
     CHECK(WTF::isMainThread());
+
+    String string = StringFromDart(url);
+    if (string.startsWith("mojo:")) {
+      Dart_Handle mojo_library = Dart_LookupLibrary(url);
+      LogIfError(mojo_library);
+      return mojo_library;
+    }
+
     return DOMDartState::Current()->loader().Import(library, url);
   }
   if (tag == Dart_kSourceTag) {

examples/dart-mojo.sky

@@ -4,10 +4,10 @@
 <script>
 import 'dart:async';
 import '/mojo/public/dart/application.dart';
-import 'dart:mojo_bindings';
-import 'dart:mojo_core';
 import 'dart:typed_data';
 import 'dart:sky.internals' as internals;
+import 'mojo:bindings';
+import 'mojo:core';
 
 import 'package:mojo/services/network/public/interfaces/network_service.mojom.dart';
 import 'package:mojo/services/network/public/interfaces/url_loader.mojom.dart';

framework/embedder.dart

@@ -3,9 +3,9 @@
 // found in the LICENSE file.
 
 import "/mojo/public/dart/application.dart";
-import "dart:mojo_bindings" as bindings;
-import "dart:mojo_core" as core;
 import "dart:sky.internals" as internals;
+import "mojo:bindings" as bindings;
+import "mojo:core" as core;
 import "package:mojo/public/interfaces/application/service_provider.mojom.dart";
 import "package:mojo/public/interfaces/application/shell.mojom.dart";
 

tests/services/iframe-embed-vmc.sky

@@ -4,12 +4,12 @@
 
 <script>
 import 'dart:async';
-import 'dart:mojo_bindings';
-import 'dart:mojo_core';
 import 'dart:sky';
 import 'dart:sky.internals' as internals;
 import 'dart:typed_data';
 import '/mojo/public/dart/application.dart';
+import 'mojo:bindings';
+import 'mojo:core';
 
 import 'package:mojo/public/interfaces/application/shell.mojom.dart' as shell_mojom;
 import 'package:mojo/services/input_events/public/interfaces/input_events.mojom.dart' as input_events;
@@ -26,7 +26,7 @@ class IFrameEmbed extends Application {
         "http://127.0.0.1:8000/sky/tests/services/resources/iframe-vmc.js";
     final vmcAppConnection = connectToApplication(vmcURL);
 
-    // The Promise returned by the vmcApp's echoString() method will not 
+    // The Promise returned by the vmcApp's echoString() method will not
     // resolve until the vmcApp's onEmbed() method runs.
     final echoService = new echo_service_mojom.EchoServiceProxy.unbound();
     vmcAppConnection.requestService(echoService);

tests/services/network.sky

@@ -3,10 +3,10 @@
 <script>
 import '/sky/framework/embedder.dart';
 import 'dart:async';
-import 'dart:mojo_bindings';
-import 'dart:mojo_core';
 import 'dart:typed_data';
 import "dart:sky.internals" as internals;
+import 'mojo:bindings';
+import 'mojo:core';
 
 import 'package:mojo/services/network/public/interfaces/network_service.mojom.dart';
 import 'package:mojo/services/network/public/interfaces/url_loader.mojom.dart';