Converts WindowTreeClientTest to be in terms of aura

services/ui/public/cpp/tests/window_server_shelltest_base.cc

Index: services/ui/public/cpp/tests/window_server_shelltest_base.cc
diff --git a/services/ui/public/cpp/tests/window_server_shelltest_base.cc b/services/ui/public/cpp/tests/window_server_shelltest_base.cc
deleted file mode 100644
index 61b2c9035ba9f1151280ae0cfca4ef8de63d0bf7..0000000000000000000000000000000000000000
--- a/services/ui/public/cpp/tests/window_server_shelltest_base.cc
+++ /dev/null
@@ -1,63 +0,0 @@
-// 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.
-
-#include "services/ui/public/cpp/tests/window_server_shelltest_base.h"
-
-#include <memory>
-
-#include "base/command_line.h"
-#include "base/macros.h"
-#include "base/memory/ptr_util.h"
-#include "services/service_manager/public/cpp/service.h"
-#include "services/service_manager/public/cpp/service_test.h"
-#include "services/ui/common/switches.h"
-#include "ui/gl/gl_switches.h"
-
-namespace ui {
-
-namespace {
-
-const char kTestAppName[] = "mus_ws_unittests_app";
-
-class WindowServerServiceTestClient
-    : public service_manager::test::ServiceTestClient {
- public:
-  explicit WindowServerServiceTestClient(WindowServerServiceTestBase* test)
-      : ServiceTestClient(test), test_(test) {}
-  ~WindowServerServiceTestClient() override {}
-
- private:
-  // service_manager::test::ServiceTestClient:
-  bool OnConnect(const service_manager::ServiceInfo& remote_info,
-                 service_manager::InterfaceRegistry* registry) override {
-    return test_->OnConnect(remote_info.identity, registry);
-  }
-
-  WindowServerServiceTestBase* test_;
-
-  DISALLOW_COPY_AND_ASSIGN(WindowServerServiceTestClient);
-};
-
-void EnsureCommandLineSwitch(const std::string& name) {
-  base::CommandLine* cmd_line = base::CommandLine::ForCurrentProcess();
-  if (!cmd_line->HasSwitch(name))
-    cmd_line->AppendSwitch(name);
-}
-
-}  // namespace
-
-WindowServerServiceTestBase::WindowServerServiceTestBase()
-    : ServiceTest(kTestAppName) {
-  EnsureCommandLineSwitch(switches::kUseTestConfig);
-  EnsureCommandLineSwitch(::switches::kOverrideUseGLWithOSMesaForTests);
-}
-
-WindowServerServiceTestBase::~WindowServerServiceTestBase() {}
-
-std::unique_ptr<service_manager::Service>
-WindowServerServiceTestBase::CreateService() {
-  return base::MakeUnique<WindowServerServiceTestClient>(this);
-}
-
-}  // namespace ui