Converts WindowTreeClientTest to be in terms of aura

mash/simple_wm/simple_wm.h

 // 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.
 
 #ifndef MASH_SIMPLE_WM_SIMPLE_WM_H_
 #define MASH_SIMPLE_WM_SIMPLE_WM_H_
 
 #include <memory>
 #include <utility>
 
@@ skipping 40 matching lines @@
 
   // service_manager::Service:
   void OnStart() override;
   bool OnConnect(const service_manager::ServiceInfo& remote_info,
                  service_manager::InterfaceRegistry* registry) override;
 
   // aura::WindowTreeClientDelegate:
   void OnEmbed(
       std::unique_ptr<aura::WindowTreeHostMus> window_tree_host) override;
   void OnLostConnection(aura::WindowTreeClient* client) override;
-  void OnEmbedRootDestroyed(aura::Window* root) override;
+  void OnEmbedRootDestroyed(aura::WindowTreeHostMus* window_tree_host) override;
   void OnPointerEventObserved(const ui::PointerEvent& event,
                               aura::Window* target) override;
   aura::client::CaptureClient* GetCaptureClient() override;
   aura::PropertyConverter* GetPropertyConverter() override;
 
   // aura::WindowManagerDelegate:
   void SetWindowManagerClient(aura::WindowManagerClient* client) override;
   bool OnWmSetBounds(aura::Window* window, gfx::Rect* bounds) override;
   bool OnWmSetProperty(
       aura::Window* window,
@@ skipping 35 matching lines @@
   std::map<aura::Window*, FrameView*> client_window_to_frame_view_;
 
   bool started_ = false;
 
   DISALLOW_COPY_AND_ASSIGN(SimpleWM);
 };
 
 }  // namespace simple_wm
 
 #endif  // MASH_SIMPLE_WM_SIMPLE_WM_H_