Converts ash to use aura-mus

ash/mus/test/wm_test_helper.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 ASH_MUS_TEST_WM_TEST_HELPER_H_
 #define ASH_MUS_TEST_WM_TEST_HELPER_H_
 
 #include <memory>
 
 #include "ash/mus/window_manager_application.h"
 #include "base/macros.h"
-#include "services/ui/public/cpp/tests/test_window_tree_client_setup.h"
+#include "ui/aura/test/mus/test_window_tree_client_setup.h"
+
+namespace aura {
+class WindowTreeClientPrivate;
+}
 
 namespace base {
 class MessageLoop;
 class SequencedWorkerPoolOwner;
 }
 
 namespace ui {
 class WindowTreeClientPrivate;
 }
 
@@ skipping 39 matching lines @@
   void UpdateDisplay(RootWindowController* root_window_controller,
                      const std::string& display_spec,
                      int* next_x);
 
   // Destroys a RootWindowController.
   void DestroyRootWindowController(
       RootWindowController* root_window_controller);
 
   std::unique_ptr<base::MessageLoop> message_loop_;
   std::unique_ptr<views::ViewsDelegate> views_delegate_;
-  ui::TestWindowTreeClientSetup window_tree_client_setup_;
+  aura::TestWindowTreeClientSetup window_tree_client_setup_;
   std::unique_ptr<WindowManagerApplication> window_manager_app_;
-  std::unique_ptr<ui::WindowTreeClientPrivate> window_tree_client_private_;
+  std::unique_ptr<aura::WindowTreeClientPrivate> window_tree_client_private_;
 
   // Id for the next Display created by CreateRootWindowController().
   int64_t next_display_id_ = 1;
 
   std::unique_ptr<base::SequencedWorkerPoolOwner> blocking_pool_owner_;
 
   DISALLOW_COPY_AND_ASSIGN(WmTestHelper);
 };
 
 }  // namespace mus
 }  // namespace ash
 
 #endif  // ASH_MUS_TEST_WM_TEST_HELPER_H_