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

chrome/browser/about_flags.cc

Index: chrome/browser/about_flags.cc
diff --git a/chrome/browser/about_flags.cc b/chrome/browser/about_flags.cc
index fb8fbf257fecb8c0cba5421fc14cfab99d1f2e72..63fac0479ff139bd49e0ba7948ac148b4c758ee9 100644
--- a/chrome/browser/about_flags.cc
+++ b/chrome/browser/about_flags.cc
@@ -926,9 +926,11 @@ const FeatureEntry kFeatureEntries[] = {
      IDS_FLAGS_RUN_ALL_FLASH_IN_ALLOW_MODE_DESCRIPTION, kOsDesktop,
      FEATURE_VALUE_TYPE(features::kRunAllFlashInAllowMode)},
 #endif  // ENABLE_PLUGINS
-#if defined(OS_CHROMEOS)
+#if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
     {"mash", IDS_FLAGS_USE_MASH_NAME, IDS_FLAGS_USE_MASH_DESCRIPTION, kOsCrOS,
-     SINGLE_VALUE_TYPE("mash")},
+     SINGLE_VALUE_TYPE(switches::kMash)},
+#endif  // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)

[fwang, 2017/02/10 07:22:32]

This change broke the LinuxOS/Ozone build bot
(https://build.chromium.org/p/chromium.fyi/builders/Ozone%20Linux) which
currently enable package mash services. For consistency, I guess we should
either leave them inside the #ifdef or (probably better) also move them outside
the chromeos conditional in generated_resources.grd.

[mfomitchev, 2017/02/10 14:10:29]

Thanks for looking into this!

+#if defined(OS_CHROMEOS)
     {"allow-touchpad-three-finger-click",
      IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_NAME,
      IDS_FLAGS_ALLOW_TOUCHPAD_THREE_FINGER_CLICK_DESCRIPTION, kOsCrOS,