mus: Show USER_PRIVATE window container during views tests

components/mus/public/cpp/tests/window_server_shelltest_base.cc

 // Copyright 2016 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 "components/mus/public/cpp/tests/window_server_shelltest_base.h"
 
 #include <memory>
 
 #include "base/command_line.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
-#include "components/mus/common/args.h"
+#include "components/mus/common/switches.h"
 #include "services/shell/public/cpp/shell_client.h"
 #include "services/shell/public/cpp/shell_test.h"
 #include "ui/gl/gl_switches.h"
 
 namespace mus {
 
 namespace {
 
 const char kTestAppName[] = "mojo:mus_ws_unittests_app";
 
@@ skipping 17 matching lines @@
 void EnsureCommandLineSwitch(const std::string& name) {
   base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
   if (!cmd_line->HasSwitch(name))
     cmd_line->AppendSwitch(name);
 }
 
 }  // namespace
 
 WindowServerShellTestBase::WindowServerShellTestBase()
     : ShellTest(kTestAppName) {
-  EnsureCommandLineSwitch(kUseTestConfig);
-  EnsureCommandLineSwitch(switches::kOverrideUseGLWithOSMesaForTests);
+  EnsureCommandLineSwitch(switches::kUseTestConfig);
+  EnsureCommandLineSwitch(::switches::kOverrideUseGLWithOSMesaForTests);
 }
 
 WindowServerShellTestBase::~WindowServerShellTestBase() {}
 
 std::unique_ptr<shell::ShellClient>
 WindowServerShellTestBase::CreateShellClient() {
   return base::WrapUnique(new WindowServerShellTestClient(this));
 }
 
 }  // namespace mus