ShellTest -> ServiceTest

ash/mus/window_manager_unittest.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 <stdint.h>
 
 #include <memory>
 #include <utility>
 
 #include "ash/public/interfaces/user_window_controller.mojom.h"
 #include "base/bind.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
-#include "services/shell/public/cpp/shell_test.h"
+#include "services/shell/public/cpp/service_test.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/cpp/window_tree_client.h"
 #include "services/ui/public/cpp/window_tree_client_delegate.h"
 #include "services/ui/public/interfaces/window_tree.mojom.h"
 
 namespace ash {
 namespace mus {
 
 class WindowTreeClientDelegate : public ::ui::WindowTreeClientDelegate {
  public:
   WindowTreeClientDelegate() {}
   ~WindowTreeClientDelegate() override {}
 
  private:
   // ui::WindowTreeClientDelegate:
   void OnEmbed(::ui::Window* root) override {}
   void OnDidDestroyClient(::ui::WindowTreeClient* client) override {}
   void OnEventObserved(const ui::Event& event, ::ui::Window* target) override {}
 
   DISALLOW_COPY_AND_ASSIGN(WindowTreeClientDelegate);
 };
 
-class WindowManagerTest : public shell::test::ShellTest {
+class WindowManagerTest : public shell::test::ServiceTest {
  public:
-  WindowManagerTest() : shell::test::ShellTest("exe:mash_unittests") {}
+  WindowManagerTest() : shell::test::ServiceTest("exe:mash_unittests") {}
   ~WindowManagerTest() override {}
 
  private:
   DISALLOW_COPY_AND_ASSIGN(WindowManagerTest);
 };
 
 void OnEmbed(bool success) {
   ASSERT_TRUE(success);
 }
 
@@ skipping 101 matching lines @@
   ::ui::Window* top_level_window = client->NewTopLevelWindow(nullptr);
   ASSERT_TRUE(top_level_window);
 
   observer.WaitUntilWindowCountReaches(1u);
   client.reset();
   observer.WaitUntilWindowCountReaches(0u);
 }
 
 }  // namespace mus
 }  // namespace ash