mus: Show USER_PRIVATE window container during views tests

mash/wm/root_window_controller.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 "mash/wm/root_window_controller.h"
 
 #include <stdint.h>
 
 #include <map>
 #include <sstream>
 
 #include "base/bind.h"
+#include "base/command_line.h"
 #include "components/mus/common/event_matcher_util.h"
+#include "components/mus/common/switches.h"
 #include "components/mus/common/util.h"
 #include "components/mus/public/cpp/property_type_converters.h"
 #include "components/mus/public/cpp/window.h"
 #include "components/mus/public/cpp/window_tree_connection.h"
 #include "components/mus/public/cpp/window_tree_host_factory.h"
 #include "components/mus/public/interfaces/window_manager.mojom.h"
 #include "mash/session/public/interfaces/session.mojom.h"
 #include "mash/wm/background_layout.h"
 #include "mash/wm/container_ids.h"
 #include "mash/wm/fill_layout.h"
@@ skipping 159 matching lines @@
   std::ostringstream container_name;
   container_name << container;
   properties[mus::mojom::WindowManager::kName_Property] =
       mojo::ConvertTo<std::vector<uint8_t>>(container_name.str());
 
   mus::Window* window = root_->connection()->NewWindow(&properties);
   window->set_local_id(ContainerToLocalId(container));
   layout_managers_[window].reset(new FillLayout(window));
 
   // User private windows are hidden by default until the window manager learns
-  // the lock state, so their contents are never accidentally revealed.
-  window->SetVisible(container != mojom::Container::USER_PRIVATE);
+  // the lock state, so their contents are never accidentally revealed. Tests,
+  // however, usually assume the screen is unlocked.
+  const bool is_test = base::CommandLine::ForCurrentProcess()->HasSwitch(
+      mus::switches::kUseTestConfig);
+  window->SetVisible(container != mojom::Container::USER_PRIVATE || is_test);
+
   mus::Window* parent =
       root_->GetChildByLocalId(ContainerToLocalId(parent_container));
   parent->AddChild(window);
 }
 
 void RootWindowController::CreateContainers() {
   CreateContainer(mojom::Container::ALL_USER_BACKGROUND,
                   mojom::Container::ROOT);
   CreateContainer(mojom::Container::USER, mojom::Container::ROOT);
   CreateContainer(mojom::Container::USER_BACKGROUND, mojom::Container::USER);
@@ skipping 43 matching lines @@
   layout_managers_[status].reset(new StatusLayoutManager(status));
 
   mus::Window* user_private_windows =
       GetWindowForContainer(mojom::Container::USER_PRIVATE_WINDOWS);
   layout_managers_[user_private_windows].reset(
       new WindowLayout(user_private_windows));
 }
 
 }  // namespace wm
 }  // namespace mash