More Windows build fixes.

mojo/shell/desktop/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 <algorithm>
 #include <iostream>
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/logging.h"
 #include "base/message_loop/message_loop.h"
 #include "base/strings/string_split.h"
 #include "base/strings/utf_string_conversions.h"
 #include "mojo/shell/child_process.h"
 #include "mojo/shell/context.h"
 #include "mojo/shell/init.h"
 #include "mojo/shell/mojo_url_resolver.h"
 #include "mojo/shell/switches.h"
 
 namespace {
 
 #if defined(OS_LINUX)
 // Copied from ui/gfx/switches.cc to avoid a dependency on //ui/gfx
 const char kEnableHarfBuzzRenderText[] = "enable-harfbuzz-rendertext";
 #endif
 
-#if defined(OS_WIN)
-void SplitString(const base::string16& str, std::vector<std::string>* argv) {
-  base::SplitString(base::UTF16ToUTF8(str), ' ', argv);
-}
-#elif defined(OS_POSIX)
-void SplitString(const std::string& str, std::vector<std::string>* argv) {
-  base::SplitString(str, ' ', argv);
-}
-#endif
-
 bool IsEmpty(const std::string& s) {
   return s.empty();
 }
 
 // The value of app_url_and_args is "<mojo_app_url> [<args>...]", where args
 // is a list of "configuration" arguments separated by spaces. If one or more
 // arguments are specified they will be available when the Mojo application
 // is initialized. See ApplicationImpl::args().
-GURL GetAppURLAndSetArgs(const base::CommandLine::StringType& app_url_and_args,
+GURL GetAppURLAndSetArgs(const std::string& app_url_and_args,
                          mojo::shell::Context* context) {
   // SplitString() returns empty strings for extra delimeter characters (' ').
   std::vector<std::string> argv;
-  SplitString(app_url_and_args, &argv);
+  base::SplitString(app_url_and_args, ' ', &argv);
   argv.erase(std::remove_if(argv.begin(), argv.end(), IsEmpty), argv.end());
 
   if (argv.empty())
     return GURL::EmptyGURL();
   GURL app_url(argv[0]);
   if (argv.size() > 1)
     context->application_manager()->SetArgsForURL(argv, app_url);
   return app_url;
 }
 
 void RunApps(mojo::shell::Context* context) {
   const auto& command_line = *base::CommandLine::ForCurrentProcess();
-  for (const auto& arg : command_line.GetArgs())
-    context->Run(GetAppURLAndSetArgs(arg, context));
+  for (const auto& arg : command_line.GetArgs()) {
+    std::string arg2;
+#if defined(OS_WIN)
+    arg2 = base::UTF16ToUTF8(arg);
+#else
+    arg2 = arg;
+#endif
+    context->Run(GetAppURLAndSetArgs(arg2, context));
+  }
 }
 
 void Usage() {
   std::cerr << "Launch Mojo applications.\n";
   std::cerr
       << "Usage: mojo_shell"
       << " [--" << switches::kArgsFor << "=<mojo-app>]"
       << " [--" << switches::kContentHandlers << "=<handlers>]"
       << " [--" << switches::kEnableExternalApplications << "]"
       << " [--" << switches::kDisableCache << "]"
@@ skipping 99 matching lines @@
         if (IsArgsFor(argv[i], &args_for_value))
           GetAppURLAndSetArgs(args_for_value, &shell_context);
       }
 
       message_loop.PostTask(FROM_HERE, base::Bind(RunApps, &shell_context));
       message_loop.Run();
     }
   }
   return 0;
 }