Corrected mojo_shell --args-for switch handling

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 87 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;
 }
 
+const std::string kArgsForSwitches[] = {
+  "-" + std::string(switches::kArgsFor),
+  "--" + std::string(switches::kArgsFor),
+};

[abarth-chromium, 2014/10/28 16:26:11]

This looks like a static initializer.  Presumably we don't want static
initializers...  Do we not have a build step that fails when we add one?

[hansmuller, 2014/10/28 16:42:04]

The kArgsForSwitches constant is stack allocated now.

+
+bool isArgsFor(const std::string& arg, std::string* value) {
+  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;
+    }
+  }
+  return false;
+}
+
 }  // namespace
 
 int main(int argc, char** argv) {
   base::AtExitManager at_exit;
   base::CommandLine::Init(argc, argv);
 
   const base::CommandLine& command_line =
     *base::CommandLine::ForCurrentProcess();
   if (command_line.HasSwitch(switches::kHelp) ||
       command_line.GetArgs().empty()){
@@ skipping 32 matching lines @@
       }
 
       if (command_line.HasSwitch(switches::kURLMappings) &&
           !ConfigureURLMappings(
               command_line.GetSwitchValueASCII(switches::kURLMappings),
               shell_context.mojo_url_resolver())) {
         Usage();
         return 0;
       }
 
-      for (const auto& kv : command_line.GetSwitches()) {
-        if (kv.first == switches::kArgsFor)
-          GetAppURLAndSetArgs(kv.second, &shell_context);
+      // 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);
       }
 
       message_loop.PostTask(FROM_HERE, base::Bind(RunApps, &shell_context));
       message_loop.Run();
     }
   }
   return 0;
 }