Extracts parameters to WindowTreeHostMus into structure

services/ui/ws/window_manager_client_unittest.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 <stddef.h>
 #include <stdint.h>
 
 #include "base/bind.h"
 #include "base/logging.h"
 #include "base/macros.h"
 #include "base/memory/ptr_util.h"
 #include "base/run_loop.h"
 #include "services/ui/common/util.h"
 #include "services/ui/ws/window_server_test_base.h"
 #include "ui/aura/client/transient_window_client.h"
 #include "ui/aura/env.h"
 #include "ui/aura/mus/window_port_mus.h"
 #include "ui/aura/mus/window_tree_client.h"
 #include "ui/aura/mus/window_tree_client_delegate.h"
 #include "ui/aura/mus/window_tree_host_mus.h"
+#include "ui/aura/mus/window_tree_host_mus_init_params.h"
 #include "ui/aura/test/mus/window_tree_client_private.h"
 #include "ui/aura/window.h"
 #include "ui/aura/window_observer.h"
 #include "ui/aura/window_tracker.h"
 #include "ui/gfx/geometry/rect.h"
 
 namespace ui {
 namespace ws {
 
 namespace {
@@ skipping 686 matching lines @@
   DISALLOW_COPY_AND_ASSIGN(EstablishConnectionViaFactoryDelegate);
 };
 
 TEST_F(WindowServerTest, EstablishConnectionViaFactory) {
   EstablishConnectionViaFactoryDelegate delegate(window_manager());
   set_window_manager_delegate(&delegate);
   aura::WindowTreeClient second_client(connector(), this, nullptr, nullptr,
                                        nullptr, false);
   second_client.ConnectViaWindowTreeFactory();
   aura::WindowTreeHostMus window_tree_host_in_second_client(
-      &second_client, cc::FrameSinkId(1, 1));
+      aura::CreateInitParamsForTopLevel(&second_client));
   window_tree_host_in_second_client.InitHost();
   window_tree_host_in_second_client.window()->Show();
   ASSERT_TRUE(second_client.GetRoots().count(
                   window_tree_host_in_second_client.window()) > 0);
   // Wait for the window to appear in the wm.
   ASSERT_TRUE(delegate.QuitOnCreate());
 
   aura::Window* window_in_wm = delegate.created_window();
   ASSERT_TRUE(window_in_wm);
 
   // Change the bounds in the wm, and make sure the child sees it.
   const gfx::Rect window_bounds(1, 11, 12, 101);
   window_in_wm->SetBounds(window_bounds);
   ASSERT_TRUE(
       WaitForBoundsToChange(window_tree_host_in_second_client.window()));
   EXPECT_EQ(window_bounds,
             window_tree_host_in_second_client.GetBoundsInPixels());
 }
 
 TEST_F(WindowServerTest, OnWindowHierarchyChangedIncludesTransientParent) {
   // Create a second connection. In the second connection create a window,
   // parent it to the root, create another window, mark it as a transient parent
   // of the first window and then add it.
   EstablishConnectionViaFactoryDelegate delegate(window_manager());
   set_window_manager_delegate(&delegate);
   aura::WindowTreeClient second_client(connector(), this, nullptr, nullptr,
                                        nullptr, false);
   second_client.ConnectViaWindowTreeFactory();
   aura::WindowTreeHostMus window_tree_host_in_second_client(
-      &second_client, cc::FrameSinkId(1, 1));
+      aura::CreateInitParamsForTopLevel(&second_client));
   window_tree_host_in_second_client.InitHost();
   window_tree_host_in_second_client.window()->Show();
   aura::Window* second_client_child = NewVisibleWindow(
       window_tree_host_in_second_client.window(), &second_client);
   std::unique_ptr<aura::WindowPortMus> window_port_mus =
       base::MakeUnique<aura::WindowPortMus>(&second_client,
                                             aura::WindowMusType::LOCAL);
   // Create the transient without a parent, set transient parent, then add.
   aura::Window* transient = NewVisibleWindow(nullptr, &second_client);
   aura::client::TransientWindowClient* transient_window_client =
@@ skipping 11 matching lines @@
   ASSERT_EQ(1u, top_level_in_wm->children().size());
   aura::Window* second_client_child_in_wm = top_level_in_wm->children()[0];
   ASSERT_EQ(1u, second_client_child_in_wm->children().size());
   aura::Window* transient_in_wm = second_client_child_in_wm->children()[0];
   ASSERT_EQ(second_client_child_in_wm,
             transient_window_client->GetTransientParent(transient_in_wm));
 }
 
 }  // namespace ws
 }  // namespace ui