Update run_mojo_media_renderer.py for shell and service changes.

media/mojo/scripts/run_mojo_media_renderer.py

Index: media/mojo/scripts/run_mojo_media_renderer.py
diff --git a/media/mojo/scripts/run_mojo_media_renderer.py b/media/mojo/scripts/run_mojo_media_renderer.py
index 6ca34dc9dbdb6a59a3ff64d555e23f648825c46c..66d3217d8e39223c13bab1ec0963d9ef680f86f7 100755
--- a/media/mojo/scripts/run_mojo_media_renderer.py
+++ b/media/mojo/scripts/run_mojo_media_renderer.py
@@ -3,17 +3,14 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 #
-# The script follows mojo/services/html_viewer/view_url.py and modified it for
-# test the mojo media renderer. The page will be rendered in a headless mode.
-#
-# TODO(xhwang): Explore the possibility of running this with the Kiosk window
-# manager. See http://crbug.com/467176
+# The script launches mojo_shell to test the mojo media renderer.
 
 import argparse
 import os
 import subprocess
 import sys
 
+
 root_path = os.path.realpath(
     os.path.join(
         os.path.dirname(
@@ -22,6 +19,7 @@ root_path = os.path.realpath(
         os.pardir,
         os.pardir))
 
+
 def _BuildShellCommand(args):
   sdk_version = subprocess.check_output(["cat",
       "third_party/mojo/src/mojo/public/VERSION"], cwd=root_path)
@@ -29,23 +27,10 @@ def _BuildShellCommand(args):
 
   shell_command = [os.path.join(build_dir, "mojo_shell")]
 
-  options = []
-
-  options.append(
-      "--origin=https://storage.googleapis.com/mojo/services/linux-x64/%s" %
-           sdk_version)
-  options.append("--url-mappings=mojo:html_viewer=file://%s/html_viewer.mojo,"
-                 "mojo:media=file://%s/media.mojo" % (build_dir, build_dir))
-
-  args_for_html_viewer = "--enable-mojo-media-renderer --is-headless "
-  if args.verbose:
-    args_for_html_viewer += \
-        "--vmodule=pipeline*=3,*renderer_impl*=3,*mojo_demuxer*=3"
-  options.append("--args-for=mojo:html_viewer %s" % args_for_html_viewer)
-
+  options = ["--enable-mojo-media-renderer"]
   if args.verbose:
-    args_for_media = "--vmodule=mojo*service=3"
-    options.append("--args-for=mojo:media %s" % args_for_media)
+    options.append("--vmodule=pipeline*=3,*renderer_impl*=3,"
+                   "*mojo_demuxer*=3,mojo*service=3")
 
   full_command = shell_command + options + [args.url]
 
@@ -54,13 +39,12 @@ def _BuildShellCommand(args):
 
   return full_command
 
+
 def main():
   parser = argparse.ArgumentParser(
       description="View a URL with HTMLViewer with mojo media renderer. "
-                  "You must have built //mojo/services/html_viewer, "
-                  "//mojo/services/network and //media/mojo/services first. "
-                  " Note that this will currently often fail spectacularly due "
-                  " to lack of binary stability in Mojo.")
+                  "You must have built //mojo, //components/html_viewer, "
+                  "//mojo/services/network and //media/mojo/services first.")
   parser.add_argument(
       "--build-dir",
       help="Path to the dir containing the linux-x64 binaries relative to the "
@@ -68,8 +52,7 @@ def main():
       default="out/Release")
   parser.add_argument("--verbose", help="Increase output verbosity.",
                       action="store_true")
-  parser.add_argument("url",
-                      help="The URL to be viewed")
+  parser.add_argument("url", help="The URL to be viewed")
 
   args = parser.parse_args()
   return subprocess.call(_BuildShellCommand(args))