Mustash: Ignore --mash flag when comparing flags in UserSessionManager.

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 <string>
 
 #include "base/at_exit.h"
 #include "base/base_paths.h"
@@ skipping 10 matching lines @@
 #include "base/path_service.h"
 #include "base/process/launch.h"
 #include "base/process/process.h"
 #include "base/run_loop.h"
 #include "base/sys_info.h"
 #include "base/task_scheduler/task_scheduler.h"
 #include "base/threading/sequenced_worker_pool.h"
 #include "base/threading/thread.h"
 #include "base/trace_event/trace_event.h"
 #include "chrome/app/mash/chrome_mash_catalog.h"
+#include "chrome/common/chrome_switches.h"
 #include "components/tracing/common/trace_to_console.h"
 #include "components/tracing/common/tracing_switches.h"
 #include "content/public/common/content_switches.h"
 #include "content/public/common/service_names.mojom.h"
 #include "mash/common/config.h"
 #include "mash/package/mash_packaged_service.h"
 #include "mash/quick_launch/public/interfaces/constants.mojom.h"
 #include "mojo/edk/embedder/embedder.h"
 #include "mojo/edk/embedder/scoped_ipc_support.h"
 #include "mojo/public/cpp/bindings/binding_set.h"
@@ skipping 68 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.
-    // 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);
+    base::CommandLine::SwitchMap new_switches = command_line->GetSwitches();
+    new_switches.erase(switches::kMash);
+    *command_line = base::CommandLine(command_line->GetProgram());
+    for (const auto sw : new_switches)

[James Cook, 2017/02/08 19:19:51]

can this be const auto& ?

I'm not sure about our style guidance for ranged-for iteration over maps.

[mfomitchev, 2017/02/08 20:39:23]

Done.

+      command_line->AppendSwitchNative(sw.first, sw.second);
   }
 
   DISALLOW_COPY_AND_ASSIGN(ServiceProcessLauncherDelegateImpl);
 };
 
 #if defined(OS_CHROMEOS)
 // Initializes breakpad crash reporting. MashCrashReporterClient handles
 // registering crash keys.
 void InitializeCrashReporting() {
   DCHECK(!breakpad::IsCrashReporterEnabled());
@@ skipping 179 matching lines @@
       command_line->GetSwitchValueASCII(switches::kWaitForDebugger)) {
     return;
   }
 
   // Include the pid as logging may not have been initialized yet (the pid
   // printed out by logging is wrong).
   LOG(WARNING) << "waiting for debugger to attach for service " << service_name
                << " pid=" << base::Process::Current().Pid();
   base::debug::WaitForDebugger(120, true);
 }