chromeos: Add a flag to launch with --mash.

chrome/app/chrome_main.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/app/chrome_main_delegate.h"
 
 #include "build/build_config.h"
 #include "chrome/common/features.h"
 #include "content/public/app/content_main.h"
 
 #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
 #include "base/command_line.h"
 #include "chrome/app/mash/mash_runner.h"
+#include "chrome/common/channel_info.h"
+#include "components/version_info/version_info.h"
 #endif
 
 #if defined(OS_WIN)
 #include "base/debug/dump_without_crashing.h"
 #include "base/win/win_util.h"
 #include "chrome/common/chrome_constants.h"
 
 #define DLLEXPORT __declspec(dllexport)
 
 // We use extern C for the prototype DLLEXPORT to avoid C++ name mangling.
@@ skipping 44 matching lines @@
   base::debug::SetDumpWithoutCrashingFunction(DumpProcess);
 #else
   params.argc = argc;
   params.argv = argv;
 #endif
 
 #if BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
 #if !defined(OS_WIN)
   base::CommandLine::Init(params.argc, params.argv);
 #endif
-  const base::CommandLine& command_line =
-      *base::CommandLine::ForCurrentProcess();
-  // TODO(sky): only do this for dev builds and if on canary channel.
-  if (command_line.HasSwitch("mash"))
-    return MashMain();
-#endif
+
+  version_info::Channel channel = chrome::GetChannel();
+  if (channel == version_info::Channel::CANARY ||
+      channel == version_info::Channel::UNKNOWN) {
+    const base::CommandLine& command_line =
+        *base::CommandLine::ForCurrentProcess();
+    if (command_line.HasSwitch("mash"))
+      return MashMain();
+  }
+#endif  // BUILDFLAG(ENABLE_PACKAGE_MASH_SERVICES)
 
   int rv = content::ContentMain(params);
 
 #if defined(OS_WIN)
   base::win::SetShouldCrashOnProcessDetach(false);
 #endif
 
   return rv;
 }