Converts WindowTreeClientTest to be in terms of aura

services/ui/ws/window_server_service_test_base.h

Index: services/ui/ws/window_server_service_test_base.h
diff --git a/services/ui/public/cpp/tests/window_server_shelltest_base.h b/services/ui/ws/window_server_service_test_base.h
similarity index 81%
rename from services/ui/public/cpp/tests/window_server_shelltest_base.h
rename to services/ui/ws/window_server_service_test_base.h
index 7e6ebab519613179f79bacf8f311b9c1e7f14da7..e3635257136d98ac7a26fef3c73f93d9ea0a7fbe 100644
--- a/services/ui/public/cpp/tests/window_server_shelltest_base.h
+++ b/services/ui/ws/window_server_service_test_base.h
@@ -2,8 +2,8 @@
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
-#ifndef SERVICES_UI_PUBLIC_CPP_TESTS_WINDOW_SERVER_SHELLTEST_BASE_H_
-#define SERVICES_UI_PUBLIC_CPP_TESTS_WINDOW_SERVER_SHELLTEST_BASE_H_
+#ifndef SERVICES_UI_WS_WINDOW_SERVER_SERVICE_TEST_BASE_H_
+#define SERVICES_UI_WS_WINDOW_SERVER_SERVICE_TEST_BASE_H_
 
 #include "base/macros.h"
 #include "services/service_manager/public/cpp/connection.h"
@@ -29,4 +29,4 @@ class WindowServerServiceTestBase : public service_manager::test::ServiceTest {
 
 }  // namespace ui
 
-#endif  // SERVICES_UI_PUBLIC_CPP_TESTS_WINDOW_SERVER_SHELLTEST_BASE_H_
+#endif  // SERVICES_UI_WS_WINDOW_SERVER_SERVICE_TEST_BASE_H_