Convert mus apptests to shelltests

components/mus/public/cpp/tests/window_server_test_base.cc

 // Copyright 2015 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 "components/mus/public/cpp/tests/window_server_test_base.h"
 
 #include "base/bind.h"
 #include "base/message_loop/message_loop.h"
 #include "base/run_loop.h"
 #include "base/test/test_timeouts.h"
@@ skipping 45 matching lines @@
 bool WindowServerTestBase::QuitRunLoop() {
   if (!current_run_loop)
     return false;
 
   current_run_loop->Quit();
   current_run_loop = nullptr;
   return true;
 }
 
 void WindowServerTestBase::SetUp() {
-  ApplicationTestBase::SetUp();
+  WindowServerShellTestBase::SetUp();
 
   CreateWindowTreeHost(connector(), this, &host_, this);
 
   ASSERT_TRUE(DoRunLoopWithTimeout());  // RunLoop should be quit by OnEmbed().
   std::swap(window_manager_, most_recent_connection_);
 }
 
-mojo::ShellClient* WindowServerTestBase::GetShellClient() {
-  return this;
-}
-
 bool WindowServerTestBase::AcceptConnection(mojo::Connection* connection) {
   connection->AddInterface<mojom::WindowTreeClient>(this);
   return true;
 }
 
 void WindowServerTestBase::OnEmbed(Window* root) {
   most_recent_connection_ = root->connection();
   EXPECT_TRUE(QuitRunLoop());
   ASSERT_TRUE(window_manager_client_);
   window_manager_client_->AddActivationParent(root);
@@ skipping 36 matching lines @@
 
 void WindowServerTestBase::Create(
     mojo::Connection* connection,
     mojo::InterfaceRequest<mojom::WindowTreeClient> request) {
   WindowTreeConnection::Create(
       this, std::move(request),
       WindowTreeConnection::CreateType::DONT_WAIT_FOR_EMBED);
 }
 
 }  // namespace mus