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

chrome/app/chrome_main.cc

Index: chrome/app/chrome_main.cc
diff --git a/chrome/app/chrome_main.cc b/chrome/app/chrome_main.cc
index c35dd61d90a72e1d3c887874fd86dba873df4aef..803445614d7bfe806efe93a6584048fccc8927d0 100644
--- a/chrome/app/chrome_main.cc
+++ b/chrome/app/chrome_main.cc
@@ -8,6 +8,7 @@
 #include "base/command_line.h"
 #include "base/time/time.h"
 #include "chrome/app/chrome_main_delegate.h"
+#include "chrome/common/chrome_switches.h"
 #include "chrome/common/features.h"
 #include "content/public/app/content_main.h"
 #include "content/public/common/content_switches.h"
@@ -101,7 +102,7 @@ int ChromeMain(int argc, const char** argv) {
   version_info::Channel channel = chrome::GetChannel();
   if (channel == version_info::Channel::CANARY ||
       channel == version_info::Channel::UNKNOWN) {
-    if (command_line->HasSwitch("mash"))
+    if (command_line->HasSwitch(switches::kMash))

[James Cook, 2017/02/07 22:07:44]

Can you fix mash_runner.cc also?

[mfomitchev, 2017/02/08 19:02:13]

Done.

       return MashMain();
     WaitForMashDebuggerIfNecessary();
     if (service_manager::ServiceManagerIsRemote())