Makes it possible for clients to directly create WindowTreeHostMus

ui/aura/test/aura_test_base.h

 // Copyright (c) 2012 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.
 
 #ifndef UI_AURA_TEST_AURA_TEST_BASE_H_
 #define UI_AURA_TEST_AURA_TEST_BASE_H_
 
 #include "base/compiler_specific.h"
 #include "base/macros.h"
 #include "base/message_loop/message_loop.h"
@@ skipping 69 matching lines @@
   TestWindowTree* window_tree() { return helper_->window_tree(); }
   WindowTreeClient* window_tree_client_impl() {
     return helper_->window_tree_client();
   }
   ui::mojom::WindowTreeClient* window_tree_client();
 
   // Resets the PropertyConverter.
   void SetPropertyConverter(std::unique_ptr<PropertyConverter> helper);
 
   // WindowTreeClientDelegate:
-  void OnEmbed(Window* root) override;
+  void OnEmbed(std::unique_ptr<WindowTreeHostMus> window_tree_host) override;
   void OnUnembed(Window* root) override;
   void OnEmbedRootDestroyed(Window* root) override;
   void OnLostConnection(WindowTreeClient* client) override;
   void OnPointerEventObserved(const ui::PointerEvent& event,
                               Window* target) override;
 
   // WindowManagerDelegate:
   void SetWindowManagerClient(WindowManagerClient* client) override;
   bool OnWmSetBounds(Window* window, gfx::Rect* bounds) override;
   bool OnWmSetProperty(
       Window* window,
       const std::string& name,
       std::unique_ptr<std::vector<uint8_t>>* new_data) override;
   Window* OnWmCreateTopLevelWindow(
       std::map<std::string, std::vector<uint8_t>>* properties) override;
   void OnWmClientJankinessChanged(const std::set<Window*>& client_windows,
                                   bool janky) override;
-  void OnWmNewDisplay(Window* window, const display::Display& display) override;
+  void OnWmNewDisplay(std::unique_ptr<WindowTreeHostMus> window_tree_host,
+                      const display::Display& display) override;
   void OnWmDisplayRemoved(Window* window) override;
   void OnWmDisplayModified(const display::Display& display) override;
   ui::mojom::EventResult OnAccelerator(uint32_t id,
                                        const ui::Event& event) override;
   void OnWmPerformMoveLoop(Window* window,
                            ui::mojom::MoveLoopSource source,
                            const gfx::Point& cursor_location,
                            const base::Callback<void(bool)>& on_done) override;
   void OnWmCancelMoveLoop(Window* window) override;
   client::FocusClient* GetFocusClient() override;
@@ skipping 28 matching lines @@
  private:
   bool setup_called_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(AuraTestBaseWithType);
 };
 
 }  // namespace test
 }  // namespace aura
 
 #endif  // UI_AURA_TEST_AURA_TEST_BASE_H_