Revert of Simplify mojo_shell since it's now only used for Mandoline.

mojo/services/kiosk_wm/kiosk_wm.cc

 // Copyright 2014 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/services/kiosk_wm/kiosk_wm.h"
 
-#include "base/command_line.h"
-#include "base/strings/utf_string_conversions.h"
 #include "mojo/services/kiosk_wm/merged_service_provider.h"
 #include "mojo/services/window_manager/basic_focus_rules.h"
 
 namespace kiosk_wm {
 
 KioskWM::KioskWM()
     : window_manager_app_(new window_manager::WindowManagerApp(this, this)),
       root_(nullptr),
       content_(nullptr),
       navigator_host_(this),
       weak_factory_(this) {
   exposed_services_impl_.AddService(this);
 }
 
 KioskWM::~KioskWM() {
 }
 
 base::WeakPtr<KioskWM> KioskWM::GetWeakPtr() {
   return weak_factory_.GetWeakPtr();
 }
 
 void KioskWM::Initialize(mojo::ApplicationImpl* app) {
   window_manager_app_->Initialize(app);
 
-  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
-  base::CommandLine::StringVector args = command_line->GetArgs();
-  if (args.empty()) {
-    default_url_ = "http://www.google.com/";
-  } else {
-#if defined(OS_WIN)
-    default_url_ = base::WideToUTF8(args[0]);
-#else
-    default_url_ = args[0];
-#endif
-  }
+  // Format: --args-for="app_url default_url"
+  if (app->args().size() > 1)
+    default_url_ = app->args()[1];
 }
 
 bool KioskWM::ConfigureIncomingConnection(
     mojo::ApplicationConnection* connection) {
   window_manager_app_->ConfigureIncomingConnection(connection);
   return true;
 }
 
 bool KioskWM::ConfigureOutgoingConnection(
     mojo::ApplicationConnection* connection) {
@@ skipping 85 matching lines @@
     return false;
   navigator_host_.RequestNavigateHistory(-1);
   return true;
 }
 
 bool KioskWM::CanHandleAccelerators() const {
   return true;
 }
 
 }  // namespace kiosk_wm