Add child for parent_mus when params.parent_mus is not initialized.

ash/mus/test/wm_test_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 "ash/mus/test/wm_test_base.h"
 
 #include <algorithm>
 #include <vector>
 
 #include "ash/mus/bridge/wm_window_mus_test_api.h"
@@ skipping 105 matching lines @@
 
   ui::Window* window = test_helper_->GetRootsOrderedByDisplayId()[0]
                            ->window_manager()
                            ->NewTopLevelWindow(&properties);
   window->SetVisible(true);
   // Most tests expect a minimum size of 0x0.
   WmWindowMusTestApi(WmWindowMus::Get(window)).set_use_empty_minimum_size(true);
   return window;
 }
 
+RootWindowController* WmTestBase::GetPrimaryRootWindowController() {
+  std::vector<RootWindowController*> roots =
+      test_helper_->GetRootsOrderedByDisplayId();
+  DCHECK(!roots.empty());
+  return roots[0];
+}
+
+RootWindowController* WmTestBase::GetSecondaryRootWindowController() {
+  std::vector<RootWindowController*> roots =
+      test_helper_->GetRootsOrderedByDisplayId();
+  return roots.size() < 2 ? nullptr : roots[1];
+}
+
+ui::Window* WmTestBase::CreateTestWindow(const gfx::Rect& bounds,
+                                         ui::wm::WindowType window_type,
+                                         RootWindowController* root) {
+  std::map<std::string, std::vector<uint8_t>> properties;
+  properties[ui::mojom::WindowManager::kWindowType_Property] =
+      mojo::ConvertTo<std::vector<uint8_t>>(
+          static_cast<int32_t>(MusWindowTypeFromWmWindowType(window_type)));
+  if (!bounds.IsEmpty()) {
+    properties[ui::mojom::WindowManager::kInitialBounds_Property] =
+        mojo::ConvertTo<std::vector<uint8_t>>(bounds);
+  }
+  properties[ui::mojom::WindowManager::kResizeBehavior_Property] =
+      mojo::ConvertTo<std::vector<uint8_t>>(
+          ui::mojom::kResizeBehaviorCanResize |
+          ui::mojom::kResizeBehaviorCanMaximize |
+          ui::mojom::kResizeBehaviorCanMinimize);
+
+  properties[ui::mojom::WindowManager::kInitialDisplayId_Property] =
+      mojo::ConvertTo<std::vector<uint8_t>>(root->display().id());
+  // LOG(ERROR) << "\n  WmTestBase::CreateTestWindow
+  // properties[ui::mojom::WindowManager::kInitialDisplayId_Property]=" <<
+  // mojo::TypeConverter<int64_t,
+  // std::vector<uint8_t>>::Convert(properties[ui::mojom::WindowManager::kInitialDisplayId_Property]);
+
+  LOG(ERROR) << "\n root->display().id()" << root->display().id() << "\n";
+
+  ui::Window* window = root->window_manager()->NewTopLevelWindow(&properties);
+  window->SetVisible(true);
+  // Most tests expect a minimum size of 0x0.
+  WmWindowMusTestApi(WmWindowMus::Get(window)).set_use_empty_minimum_size(true);
+  return window;
+}
+
+ui::Window* WmTestBase::CreateFullscreenTestWindow(RootWindowController* root) {
+  std::map<std::string, std::vector<uint8_t>> properties;
+  properties[ui::mojom::WindowManager::kShowState_Property] =
+      mojo::ConvertTo<std::vector<uint8_t>>(
+          static_cast<int32_t>(ui::mojom::ShowState::FULLSCREEN));
+  properties[ui::mojom::WindowManager::kInitialDisplayId_Property] =
+      mojo::ConvertTo<std::vector<uint8_t>>(root->display().id());
+
+  ui::Window* window = root->window_manager()->NewTopLevelWindow(&properties);
+  window->SetVisible(true);
+  return window;
+}
+
 ui::Window* WmTestBase::CreateFullscreenTestWindow() {
   std::map<std::string, std::vector<uint8_t>> properties;
   properties[ui::mojom::WindowManager::kShowState_Property] =
       mojo::ConvertTo<std::vector<uint8_t>>(
           static_cast<int32_t>(ui::mojom::ShowState::FULLSCREEN));
   ui::Window* window = test_helper_->GetRootsOrderedByDisplayId()[0]
                            ->window_manager()
                            ->NewTopLevelWindow(&properties);
   window->SetVisible(true);
   return window;
@@ skipping 21 matching lines @@
   test_helper_->Init();
 }
 
 void WmTestBase::TearDown() {
   teardown_called_ = true;
   test_helper_.reset();
 }
 
 }  // namespace mus
 }  // namespace ash