chromeos: Adds --mus flag

chrome/browser/about_flags.cc

 // Copyright (c) 2012 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/browser/about_flags.h"
 
 #include <iterator>
 #include <map>
 #include <set>
 #include <utility>
@@ skipping 438 matching lines @@
     {flags_ui::kGenericExperimentChoiceDefault, "", ""},
     {flags_ui::kGenericExperimentChoiceEnabled,
      chromeos::switches::kEnableDataSaverPrompt, ""},
     {flags_ui::kGenericExperimentChoiceDisabled,
      chromeos::switches::kDisableDataSaverPrompt, ""},
     {flag_descriptions::kDatasaverPromptDemoMode,
      chromeos::switches::kEnableDataSaverPrompt,
      chromeos::switches::kDataSaverPromptDemoMode},
 };
 
+const FeatureEntry::Choice kUseMusChoices[] = {
+    {flags_ui::kGenericExperimentChoiceDefault, "", ""},
+    {flag_descriptions::kEnableMusDescription, switches::kMus, ""},
+    {flag_descriptions::kEnableMashDescription, switches::kMash, ""},
+};
+
 const FeatureEntry::Choice kUiShowCompositedLayerBordersChoices[] = {
     {flags_ui::kGenericExperimentChoiceDefault, "", ""},
     {flag_descriptions::kUiShowCompositedLayerBordersRenderPass,
      cc::switches::kUIShowCompositedLayerBorders,
      cc::switches::kCompositedRenderPassBorders},
     {flag_descriptions::kUiShowCompositedLayerBordersSurface,
      cc::switches::kUIShowCompositedLayerBorders,
      cc::switches::kCompositedSurfaceBorders},
     {flag_descriptions::kUiShowCompositedLayerBordersLayer,
      cc::switches::kUIShowCompositedLayerBorders,
@@ skipping 800 matching lines @@
      FEATURE_VALUE_TYPE(features::kPreferHtmlOverPlugins)},
     {"allow-nacl-socket-api", flag_descriptions::kAllowNaclSocketApiName,
      flag_descriptions::kAllowNaclSocketApiDescription, kOsDesktop,
      SINGLE_VALUE_TYPE_AND_VALUE(switches::kAllowNaClSocketAPI, "*")},
     {"run-all-flash-in-allow-mode",
      flag_descriptions::kRunAllFlashInAllowModeName,
      flag_descriptions::kRunAllFlashInAllowModeDescription, kOsDesktop,
      FEATURE_VALUE_TYPE(features::kRunAllFlashInAllowMode)},
 #endif  // ENABLE_PLUGINS
 #if defined(OS_CHROMEOS)
-    {"mash", flag_descriptions::kUseMashName,
-     flag_descriptions::kUseMashDescription, kOsCrOS,
-     SINGLE_VALUE_TYPE(switches::kMash)},
+    {"mus", flag_descriptions::kUseMusName,
+     flag_descriptions::kUseMusDescription, kOsCrOS,
+     MULTI_VALUE_TYPE(kUseMusChoices)},
     {"allow-touchpad-three-finger-click",
      flag_descriptions::kAllowTouchpadThreeFingerClickName,
      flag_descriptions::kAllowTouchpadThreeFingerClickDescription, kOsCrOS,
      SINGLE_VALUE_TYPE(chromeos::switches::kEnableTouchpadThreeFingerClick)},
     {"ash-enable-unified-desktop",
      flag_descriptions::kAshEnableUnifiedDesktopName,
      flag_descriptions::kAshEnableUnifiedDesktopDescription, kOsCrOS,
      SINGLE_VALUE_TYPE(switches::kEnableUnifiedDesktop)},
     {"enable-easy-unlock-proximity-detection",
      flag_descriptions::kEasyUnlockProximityDetectionName,
@@ skipping 1660 matching lines @@
   if (!strcmp("enable-data-reduction-proxy-carrier-test",
               entry.internal_name) &&
       channel != version_info::Channel::DEV &&
       channel != version_info::Channel::CANARY &&
       channel != version_info::Channel::UNKNOWN) {
     return true;
   }
 #endif  // OS_ANDROID
 
 #if defined(OS_CHROMEOS)
-  // Don't expose --mash outside of Canary or developer builds.
-  if (!strcmp("mash", entry.internal_name) &&
+  // Don't expose --mash/--mus outside of Canary or developer builds.
+  if (!strcmp("mus", entry.internal_name) &&
       channel != version_info::Channel::DEV &&
       channel != version_info::Channel::UNKNOWN) {
     return true;
   }
 #endif  // defined(OS_CHROMEOS)
 
   // data-reduction-proxy-lo-fi and enable-data-reduction-proxy-lite-page
   // are only available for Chromium builds and the Canary/Dev/Beta channels.
   if ((!strcmp("data-reduction-proxy-lo-fi", entry.internal_name) ||
        !strcmp("enable-data-reduction-proxy-lite-page",
@@ skipping 152 matching lines @@
 const base::HistogramBase::Sample kBadSwitchFormatHistogramId = 0;
 
 const FeatureEntry* GetFeatureEntries(size_t* count) {
   *count = arraysize(kFeatureEntries);
   return kFeatureEntries;
 }
 
 }  // namespace testing
 
 }  // namespace about_flags