More Windows build fixes, some tidying in mojo_main

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"
@@ skipping 17 matching lines @@
 #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 is_empty(const std::string& s) {
+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,
                          mojo::shell::Context* context) {
   // SplitString() returns empty strings for extra delimeter characters (' ').
   std::vector<std::string> argv;
   SplitString(app_url_and_args, &argv);
-  argv.erase(std::remove_if(argv.begin(), argv.end(), is_empty), argv.end());
+  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) {
@@ skipping 32 matching lines @@
   for (const StringPair& pair : pairs) {
     const GURL from(pair.first);
     const GURL to(pair.second);
     if (!from.is_valid() || !to.is_valid())
       return false;
     resolver->AddCustomMapping(from, to);
   }
   return true;
 }
 
-bool isArgsFor(const std::string& arg, std::string* value) {
+bool IsArgsFor(const std::string& arg, std::string* value) {
   const std::string kArgsForSwitches[] = {
     "-" + std::string(switches::kArgsFor),
     "--" + std::string(switches::kArgsFor),
   };
   for (size_t i = 0; i < arraysize(kArgsForSwitches); i++) {
     std::string argsfor_switch(kArgsForSwitches[i]);
     if (arg.compare(0, argsfor_switch.size(), argsfor_switch) == 0) {
       *value = arg.substr(argsfor_switch.size() + 1, std::string::npos);
       return true;
     }
@@ skipping 48 matching lines @@
               command_line.GetSwitchValueASCII(switches::kURLMappings),
               shell_context.mojo_url_resolver())) {
         Usage();
         return 0;
       }
 
       // The mojo_shell --args-for command-line switch is handled specially
       // because it can appear more than once. The base::CommandLine class
       // collapses multiple occurrences of the same switch.
       for (int i = 1; i < argc; i++) {
-        std::string argsForValue;
-        if (isArgsFor(argv[i], &argsForValue))
-          GetAppURLAndSetArgs(argsForValue, &shell_context);
+        std::string args_for_value;
+        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;
 }