mus: Show USER_PRIVATE window container during views tests

ui/views/mus/views_mus_test_suite.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 "ui/views/mus/views_mus_test_suite.h"
 
 #include <memory>
 
 #include "base/command_line.h"
 #include "base/files/file_path.h"
 #include "base/run_loop.h"
 #include "base/synchronization/waitable_event.h"
 #include "base/threading/simple_thread.h"
 #include "base/threading/thread.h"
+#include "components/mus/common/switches.h"
 #include "services/shell/background/background_shell.h"
 #include "services/shell/public/cpp/connector.h"
 #include "services/shell/public/cpp/shell_client.h"
 #include "services/shell/public/cpp/shell_connection.h"
 #include "testing/gtest/include/gtest/gtest.h"
 #include "ui/views/mus/window_manager_connection.h"
 #include "ui/views/test/platform_test_helper.h"
 #include "ui/views/views_delegate.h"
 
 namespace views {
 namespace {
 
+void EnsureCommandLineSwitch(const std::string& name) {
+  base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
+  if (!cmd_line->HasSwitch(name))
+    cmd_line->AppendSwitch(name);
+}
+
 class DefaultShellClient : public shell::ShellClient {
  public:
   DefaultShellClient() {}
   ~DefaultShellClient() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(DefaultShellClient);
 };
 
 class PlatformTestHelperMus : public PlatformTestHelper {
@@ skipping 86 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(ShellConnection);
 };
 
 ViewsMusTestSuite::ViewsMusTestSuite(int argc, char** argv)
     : ViewsTestSuite(argc, argv) {}
 
 ViewsMusTestSuite::~ViewsMusTestSuite() {}
 
 void ViewsMusTestSuite::Initialize() {
   PlatformTestHelper::SetIsMus();
+  // Let other mojo apps know that we're running in tests. Do this with a
+  // command line flag to avoid making blocking calls to other processes for
+  // setup for tests (e.g. to unlock the screen in the window manager).
+  EnsureCommandLineSwitch(mus::switches::kUseTestConfig);
+
   ViewsTestSuite::Initialize();
   shell_connections_.reset(new ShellConnection);
 }
 
 void ViewsMusTestSuite::Shutdown() {
   shell_connections_.reset();
   ViewsTestSuite::Shutdown();
 }
 
 }  // namespace views