[minijail] Update to new libchrome API

minijail_main.cc

 // Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 // Some portions Copyright (c) 2009 The Chromium Authors.
 //
 // Driver program for applying a minijail from the commandline to
 // a process and its children (depending on the feature).
 
 #include "minijail/minijail.h"
 
@@ skipping 98 matching lines @@
     PLOG_IF(WARNING, errno) << "failed to parse gid";
     jail_opts->set_gid(gid);
   }
 
   if (!jail_opts->FixUpDependencies()) {
     LOG(FATAL) << "Irreconcilable jail options given. Aborting.";
   }
 
   // Grab the loose args to use as the command line.
   // We have to wstring->argv[][] manually. Ugh.
-  std::vector<std::wstring> loose_wide_args = cl->GetLooseValues();
-  std::vector<std::string> loose_args(loose_wide_args.size());
-  char const* *jailed_argv = new char const*[loose_wide_args.size() + 1];
-  std::vector<std::wstring>::const_iterator arg_it = loose_wide_args.begin();
+  std::vector<std::string> loose_args = cl->args();
+  char const* *jailed_argv = new char const*[loose_args.size() + 1];
+  std::vector<std::string>::const_iterator arg_it = loose_args.begin();
   char const* *ja = jailed_argv;
-  for (; arg_it != loose_wide_args.end(); ++arg_it) {
-    std::string arg = WideToASCII(*arg_it);
-    loose_args.push_back(arg);
+  for (; arg_it != loose_args.end(); ++arg_it) {
     // XXX: clean up this leak even though it doesn't matter.
-    *ja++ = strdup(arg.c_str());
+    *ja++ = strdup(arg_it->c_str());
   }
   *ja = 0;
 
   jail_opts->set_executable_path(jailed_argv[0]);
   jail_opts->set_arguments(const_cast<char * const*>(jailed_argv),
                            loose_args.size());
   // XXX We just leak this since we're going to exec anyhow.
   // delete jailed_argv;
 }
 
 int main(int argc, char *argv[], char **envp) {
   CommandLine::Init(argc, argv);
   logging::InitLogging(NULL,
                        logging::LOG_ONLY_TO_SYSTEM_DEBUG_LOG,
                        logging::DONT_LOCK_LOG_FILE,
                        logging::APPEND_TO_OLD_LOG_FILE);
 
   chromeos::MiniJailOptions jail_opts;
   CommandLine *cl = CommandLine::ForCurrentProcess();
   ProcessSwitches(cl, &jail_opts);
   jail_opts.set_environment(envp);
 
   LOG_IF(FATAL, !jail_opts.executable_path()) << "No executable given";
 
   chromeos::MiniJail jail;
   jail.Initialize(&jail_opts);
   bool ok = jail.Jail() && jail.Run();
   return !ok;
 }
-