ShellTest -> ServiceTest

services/ui/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 "services/ui/public/cpp/tests/window_server_test_base.h"
 
 #include "base/bind.h"
 #include "base/location.h"
 #include "base/run_loop.h"
 #include "base/single_thread_task_runner.h"
@@ skipping 47 matching lines @@
 bool WindowServerTestBase::QuitRunLoop() {
   if (!current_run_loop)
     return false;
 
   current_run_loop->Quit();
   current_run_loop = nullptr;
   return true;
 }
 
 void WindowServerTestBase::SetUp() {
-  WindowServerShellTestBase::SetUp();
+  WindowServerServiceTestBase::SetUp();
 
   CreateWindowTreeHost(connector(), this, &host_, this);
 
   ASSERT_TRUE(DoRunLoopWithTimeout());  // RunLoop should be quit by OnEmbed().
   std::swap(window_manager_, most_recent_client_);
 }
 
 bool WindowServerTestBase::OnConnect(shell::Connection* connection) {
   connection->AddInterface<mojom::WindowTreeClient>(this);
   return true;
@@ skipping 56 matching lines @@
   if (window_manager_delegate_)
     window_manager_delegate_->OnAccelerator(id, event);
 }
 
 void WindowServerTestBase::Create(shell::Connection* connection,
                                   mojom::WindowTreeClientRequest request) {
   new WindowTreeClient(this, nullptr, std::move(request));
 }
 
 }  // namespace ui