Mojo: (Mostly) factor out command-line switches from the shell's load code path.

mojo/shell/android/mojo_main.cc

 // Copyright 2013 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "mojo/shell/android/mojo_main.h"
 
 #include "base/android/jni_string.h"
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
@@ skipping 40 matching lines @@
   g_java_message_loop.Get().reset(new base::MessageLoopForUI);
   base::MessageLoopForUI::current()->Start();
 
   // TODO(abarth): At which point should we switch to cross-platform
   // initialization?
 
   gfx::GLSurface::InitializeOneOff();
 }
 
 static void Start(JNIEnv* env, jclass clazz, jobject context, jstring jurl) {
-  std::string app_url;
+  std::vector<GURL> app_urls;
 #if defined(MOJO_SHELL_DEBUG_URL)
-  app_url = MOJO_SHELL_DEBUG_URL;
+  app_urls.push_back(GURL(MOJO_SHELL_DEBUG_URL));
   // Sleep for 5 seconds to give the debugger a chance to attach.
   sleep(5);
 #else
   if (jurl)
-    app_url = base::android::ConvertJavaStringToUTF8(env, jurl);
+    app_urls.push_back(GURL(base::android::ConvertJavaStringToUTF8(env, jurl)));
 #endif
-  if (!app_url.empty()) {
-    std::vector<std::string> argv;
-    argv.push_back("mojo_shell");
-    argv.push_back(app_url);
-    base::CommandLine::ForCurrentProcess()->InitFromArgv(argv);
-  }
 
   g_env.Get().reset(new Environment);
 
   base::android::ScopedJavaGlobalRef<jobject> activity;
   activity.Reset(env, context);
 
   shell::Context* shell_context = new shell::Context();
   shell_context->set_activity(activity.obj());
 
   g_context.Get().reset(shell_context);
-  shell::Run(shell_context);
+  shell::Run(shell_context, app_urls);
 }
 
 bool RegisterMojoMain(JNIEnv* env) {
   return RegisterNativesImpl(env);
 }
 
 }  // namespace mojo