Extracts parameters to WindowTreeHostMus into structure

ui/aura/mus/window_tree_host_mus.h

Index: ui/aura/mus/window_tree_host_mus.h
diff --git a/ui/aura/mus/window_tree_host_mus.h b/ui/aura/mus/window_tree_host_mus.h
index 9cbebf3700d8b45fb7fe0d26955629f7f436efa3..507672f56fe6003343b516cb4d85cd3add3ad786 100644
--- a/ui/aura/mus/window_tree_host_mus.h
+++ b/ui/aura/mus/window_tree_host_mus.h
@@ -7,9 +7,7 @@
 
 #include <stdint.h>
 
-#include <map>
 #include <memory>
-#include <string>
 #include <vector>
 
 #include "base/macros.h"
@@ -25,32 +23,15 @@ class Display;
 namespace aura {
 
 class InputMethodMus;
-class WindowPortMus;
 class WindowTreeClient;
 class WindowTreeHostMusDelegate;
 
+struct WindowTreeHostMusInitParams;
+
 class AURA_EXPORT WindowTreeHostMus : public aura::WindowTreeHostPlatform {
  public:
-  // |properties| are applied to the window created by this class (using
-  // PropertyConverter).
-  // TODO: this should take an unordered_map, see http://crbug.com/670515.
-  WindowTreeHostMus(
-      std::unique_ptr<WindowPortMus> window_port,
-      WindowTreeClient* window_tree_client,
-      int64_t display_id,
-      const cc::FrameSinkId& frame_sink_id = cc::FrameSinkId(),
-      const std::map<std::string, std::vector<uint8_t>>* properties = nullptr);
-
-  // This constructor is intended for creating top level windows in
-  // non-window-manager code. |properties| are properties passed verbatim to
-  // the server, that is, no conversion is done before sending |properties| to
-  // the server. Additionally |properties| are passed to PropertyConverter and
-  // any known properties are set on the Window created by this class.
-  // TODO: this should take an unordered_map, see http://crbug.com/670515.
   explicit WindowTreeHostMus(
-      WindowTreeClient* window_tree_client,
-      const cc::FrameSinkId& frame_sink_id = cc::FrameSinkId(),
-      const std::map<std::string, std::vector<uint8_t>>* properties = nullptr);
+      std::unique_ptr<WindowTreeHostMusInitParams> init_params);
 
   ~WindowTreeHostMus() override;