ShellTest -> ServiceTest

ash/mus/accelerator_registrar_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 "base/bind.h"
 #include "base/macros.h"
 #include "base/run_loop.h"
 #include "mojo/public/cpp/bindings/binding.h"
-#include "services/shell/public/cpp/shell_test.h"
+#include "services/shell/public/cpp/service_test.h"
 #include "services/ui/common/event_matcher_util.h"
 #include "services/ui/public/cpp/window.h"
 #include "services/ui/public/interfaces/accelerator_registrar.mojom.h"
 
 using ::ui::mojom::AcceleratorHandler;
 using ::ui::mojom::AcceleratorHandlerPtr;
 using ::ui::mojom::AcceleratorRegistrar;
 using ::ui::mojom::AcceleratorRegistrarPtr;
 
 namespace ash {
@@ skipping 36 matching lines @@
 
   std::set<uint32_t> installed_accelerators_;
   std::unique_ptr<base::RunLoop> run_loop_;
   mojo::Binding<AcceleratorHandler> binding_;
   AcceleratorRegistrarPtr registrar_;
   bool add_accelerator_result_;
 
   DISALLOW_COPY_AND_ASSIGN(TestAcceleratorHandler);
 };
 
-class AcceleratorRegistrarTest : public shell::test::ShellTest {
+class AcceleratorRegistrarTest : public shell::test::ServiceTest {
  public:
-  AcceleratorRegistrarTest() : shell::test::ShellTest("exe:mash_unittests") {}
+  AcceleratorRegistrarTest() : shell::test::ServiceTest("exe:mash_unittests") {}
   ~AcceleratorRegistrarTest() override {}
 
  protected:
   void ConnectToRegistrar(AcceleratorRegistrarPtr* registrar) {
     connector()->ConnectToInterface("mojo:ash", registrar);
   }
 
  private:
   DISALLOW_COPY_AND_ASSIGN(AcceleratorRegistrarTest);
 };
@@ skipping 24 matching lines @@
   EXPECT_FALSE(handler_first.AttemptToInstallAccelerator(
       3, ::ui::CreateKeyMatcher(ui::mojom::KeyboardCode::N,
                                 ui::mojom::kEventFlagShiftDown)));
   EXPECT_FALSE(handler_second.AttemptToInstallAccelerator(
       3, ::ui::CreateKeyMatcher(ui::mojom::KeyboardCode::N,
                                 ui::mojom::kEventFlagShiftDown)));
 }
 
 }  // namespace mus
 }  // namespace ash