mash: Support ShelfModel access in Chrome.

chrome/browser/chromeos/ash_config.cc

 // Copyright 2017 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/chromeos/ash_config.h"
 
 #include "base/command_line.h"
 #include "chrome/common/chrome_switches.h"
 #include "services/service_manager/runner/common/client_util.h"
 
 namespace chromeos {
 
+namespace {
+
+ash::Config ComputeAshConfig() {
+  base::CommandLine* command_line = base::CommandLine::ForCurrentProcess();
+  std::string flag = command_line->GetSwitchValueASCII(switches::kMusConfig);
+  ash::Config config = ash::Config::CLASSIC;
+  if (command_line->HasSwitch("mash") || flag == switches::kMash)
+    config = ash::Config::MASH;
+  else if (command_line->HasSwitch("mus") || flag == switches::kMus)
+    config = ash::Config::MUS;
+  VLOG_IF(1, config != ash::Config::CLASSIC &&
+                 !service_manager::ServiceManagerIsRemote())
+      << " Running with a simulated ash config (likely for testing).";
+  return config;
+}
+
+}  // namespace
+
 ash::Config GetAshConfig() {
-  if (!service_manager::ServiceManagerIsRemote())
-    return ash::Config::CLASSIC;
-
-  return base::CommandLine::ForCurrentProcess()->GetSwitchValueASCII(
-             switches::kMusConfig) == switches::kMash
-             ? ash::Config::MASH
-             : ash::Config::MUS;
+  static const ash::Config config = ComputeAshConfig();
+  return config;
 }
 
 }  // namespace chromeos