mus: Show USER_PRIVATE window container during views tests

components/mus/mus_app.cc

 // Copyright 2014 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/mus_app.h"
 
 #include <set>
 
 #include "base/bind.h"
 #include "base/command_line.h"
 #include "base/memory/ptr_util.h"
 #include "base/memory/weak_ptr.h"
 #include "base/threading/platform_thread.h"
 #include "build/build_config.h"
-#include "components/mus/common/args.h"
+#include "components/mus/common/switches.h"
 #include "components/mus/gles2/gpu_impl.h"
 #include "components/mus/ws/display.h"
 #include "components/mus/ws/display_binding.h"
 #include "components/mus/ws/display_manager.h"
 #include "components/mus/ws/platform_screen.h"
 #include "components/mus/ws/user_display_manager.h"
 #include "components/mus/ws/window_server.h"
 #include "components/mus/ws/window_server_test_impl.h"
 #include "components/mus/ws/window_tree.h"
 #include "components/mus/ws/window_tree_binding.h"
@@ skipping 105 matching lines @@
 void MusApp::Initialize(shell::Connector* connector,
                         const shell::Identity& identity,
                         uint32_t id) {
   platform_display_init_params_.connector = connector;
   platform_display_init_params_.surfaces_state = new SurfacesState;
 
   base::PlatformThread::SetName("mus");
   tracing_.Initialize(connector, identity.name());
   TRACE_EVENT0("mus", "MusApp::Initialize started");
 
-  test_config_ =
-      base::CommandLine::ForCurrentProcess()->HasSwitch(kUseTestConfig);
+  test_config_ = base::CommandLine::ForCurrentProcess()->HasSwitch(
+      switches::kUseTestConfig);
 #if defined(USE_X11)
   XInitThreads();
   if (test_config_)
     ui::test::SetUseOverrideRedirectWindowByDefault(true);
 #endif
 
   InitializeResources(connector);
 
 #if defined(USE_OZONE)
   // The ozone platform can provide its own event source. So initialize the
@@ skipping 130 matching lines @@
   platform_display_init_params_.display_bounds = bounds;
   platform_display_init_params_.display_id = id;
 
   // Display manages its own lifetime.
   ws::Display* host_impl =
       new ws::Display(window_server_.get(), platform_display_init_params_);
   host_impl->Init(nullptr);
 }
 
 }  // namespace mus