From d1c92fa42448ba66c0b77ada5a24f8e88f05a8f9 Mon Sep 17 00:00:00 2001
From: Benjamin Lerman <qsr@chromium.org>
Date: Thu, 6 Nov 2014 17:23:18 +0100
Subject: [PATCH] Change mojo url to always use mojo:foo instead of mojo://foo

R=abarth@chromium.org

Review URL: https://codereview.chromium.org/701933004
---
 engine/src/flutter/HACKING.md                 | 2 +-
 engine/src/flutter/README.md                  | 4 ++--
 engine/src/flutter/tests/services/network.sky | 2 +-
 engine/src/flutter/tools/skydb                | 6 +++---
 engine/src/flutter/tools/test_perf            | 8 ++++----
 5 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/engine/src/flutter/HACKING.md b/engine/src/flutter/HACKING.md
index 63f4248397..8e36be8449 100644
--- a/engine/src/flutter/HACKING.md
+++ b/engine/src/flutter/HACKING.md
@@ -28,7 +28,7 @@ Running tests manually
 ----------------------
 
 * ``sky/tools/run_sky_httpd``
-* ``out/Debug/mojo_shell --args-for="mojo://native_viewport_service/ --use-headless-config" --content-handlers=text/html,mojo://sky_viewer/ --url-mappings=mojo:window_manager=mojo:sky_tester mojo:window_manager``
+* ``out/Debug/mojo_shell --args-for="mojo:native_viewport_service --use-headless-config" --content-handlers=text/html,mojo:sky_viewer --url-mappings=mojo:window_manager=mojo:sky_tester mojo:window_manager``
 * The ``sky_tester`` should print ``#READY`` when ready
 * Type the URL you wish to run, for example ``http://127.0.0.1:8000/lowlevel/text.html``, and press the enter key
 * The harness should print the results of the test.  You can then type another URL.
diff --git a/engine/src/flutter/README.md b/engine/src/flutter/README.md
index 1b4a97e589..d8d5c42afd 100644
--- a/engine/src/flutter/README.md
+++ b/engine/src/flutter/README.md
@@ -128,14 +128,14 @@ As an example, the following is a sketch of a module that wraps Mojo's
 
 ```html
 SKY MODULE
-<import src=”mojo://shell” as=”shell” />
+<import src=”mojo:shell” as=”shell” />
 <import src="/mojo/network/network_service.mojom.sky" as="net" />
 <import src="/mojo/network/url_loader.mojom.sky" as="loader" />
 <script>
 module.exports = function fetch(url) {
   return new Promise(function(resolve, reject) {
     var networkService = shell.connectToService(
-        "mojo://network_service", net.NetworkService);
+        "mojo:network_service", net.NetworkService);
     var request = new loader.URLRequest({
         url: url, method: "GET", auto_follow_redirects: true});
     var urlLoader = networkService.createURLLoader();
diff --git a/engine/src/flutter/tests/services/network.sky b/engine/src/flutter/tests/services/network.sky
index 25a75a6adb..6b101b5f88 100644
--- a/engine/src/flutter/tests/services/network.sky
+++ b/engine/src/flutter/tests/services/network.sky
@@ -11,7 +11,7 @@ describe('Mojo network_service', function() {
 
   it('should be able to fetch text files', function(done) {
     var netServiceHandle = internals.connectToService(
-        "mojo://network_service/", "mojo::NetworkService");
+        "mojo:network_service", "mojo::NetworkService");
     var netConnection = new connection.Connection(
         netServiceHandle,
         net.NetworkService.stubClass,
diff --git a/engine/src/flutter/tools/skydb b/engine/src/flutter/tools/skydb
index c880f30bfd..bf1e2a1bea 100755
--- a/engine/src/flutter/tools/skydb
+++ b/engine/src/flutter/tools/skydb
@@ -67,7 +67,7 @@ class SkyDebugger(object):
         parser.add_argument('url', nargs='?', type=str)
         args = parser.parse_args()
 
-        content_handlers = ['%s,%s' % (mime_type, 'mojo://sky_viewer/')
+        content_handlers = ['%s,%s' % (mime_type, 'mojo:sky_viewer')
             for mime_type in SUPPORTED_MIME_TYPES]
         shell_command = [
             self.paths.mojo_shell_path,
@@ -81,10 +81,10 @@ class SkyDebugger(object):
             if not urlparse.urlparse(url).scheme:
                 url = self._start_http_server_for_file(url)
 
-            prompt_args = '--args-for=mojo://sky_debugger_prompt/ %s' % url
+            prompt_args = '--args-for=mojo:sky_debugger_prompt %s' % url
             shell_command.append(prompt_args)
         if args.use_osmesa:
-            shell_command.append('--args-for=mojo://native_viewport_service/ --use-osmesa')
+            shell_command.append('--args-for=mojo:native_viewport_service --use-osmesa')
         if args.gdb:
             shell_command = ['gdb', '--args'] + shell_command
 
diff --git a/engine/src/flutter/tools/test_perf b/engine/src/flutter/tools/test_perf
index 02d4ea095d..b9db149490 100755
--- a/engine/src/flutter/tools/test_perf
+++ b/engine/src/flutter/tools/test_perf
@@ -71,14 +71,14 @@ class PerfHarness(object):
         ])
 
     def _sky_tester_command(self, url):
-        content_handlers = ['%s,%s' % (mime_type, 'mojo://sky_viewer/')
+        content_handlers = ['%s,%s' % (mime_type, 'mojo:sky_viewer')
             for mime_type in SUPPORTED_MIME_TYPES]
         return [
             self.paths.mojo_shell_path,
-            '--args-for=mojo://native_viewport_service/ --use-headless-config --use-osmesa',
-            '--args-for=mojo://window_manager/ %s' % url,
+            '--args-for=mojo:native_viewport_service --use-headless-config --use-osmesa',
+            '--args-for=mojo:window_manager %s' % url,
             '--content-handlers=%s' % ','.join(content_handlers),
-            '--url-mappings=mojo:window_manager=mojo://sky_tester/',
+            '--url-mappings=mojo:window_manager=mojo:sky_tester',
             'mojo:window_manager',
         ]