Tolerate more than one copy of the --mash command line switch

chrome/app/mash/mash_runner.cc

 // Copyright 2016 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 "chrome/app/mash/mash_runner.h"
 
 #include "base/at_exit.h"
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/debug/debugger.h"
@@ skipping 87 matching lines @@
       // child process. The new process will execute MashRunner::RunChild().
       command_line->AppendSwitchASCII(switches::kProcessType, kMashChild);
 #if defined(OS_WIN)
       command_line->AppendArg(switches::kPrefetchArgumentOther);
 #endif
       return;
     }
 
     // When launching the browser process, ensure that we don't inherit the
     // --mash flag so it proceeds with the normal content/browser startup path.
-    base::CommandLine::StringVector argv(command_line->argv());
-    auto iter =
-        std::find(argv.begin(), argv.end(), FILE_PATH_LITERAL("--mash"));
-    if (iter != argv.end())
-      argv.erase(iter);
-    *command_line = base::CommandLine(argv);
+    // Eliminate all copies in case the developer passed more than one.
+    base::CommandLine::StringVector new_argv;
+    for (const base::CommandLine::StringType& arg : command_line->argv()) {
+      if (arg != FILE_PATH_LITERAL("--mash"))
+        new_argv.push_back(arg);
+    }
+    *command_line = base::CommandLine(new_argv);
   }
 
   DISALLOW_COPY_AND_ASSIGN(NativeRunnerDelegateImpl);
 };
 
 }  // namespace
 
 MashRunner::MashRunner() {}
 
 MashRunner::~MashRunner() {}
@@ skipping 108 matching lines @@
     base::trace_event::TraceConfig trace_config =
         tracing::GetConfigForTraceToConsole();
     base::trace_event::TraceLog::GetInstance()->SetEnabled(
         trace_config,
         base::trace_event::TraceLog::RECORDING_MODE);
   }
 
   MashRunner mash_runner;
   return mash_runner.Run();
 }