ShellTest -> ServiceTest

services/shell/public/cpp/shell_test.h

Index: services/shell/public/cpp/shell_test.h
diff --git a/services/shell/public/cpp/shell_test.h b/services/shell/public/cpp/shell_test.h
deleted file mode 100644
index 452018efb6a39e6e110de13633baa628604d1b91..0000000000000000000000000000000000000000
--- a/services/shell/public/cpp/shell_test.h
+++ /dev/null
@@ -1,112 +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.
-
-#ifndef SERVICES_SHELL_PUBLIC_CPP_SHELL_TEST_H_
-#define SERVICES_SHELL_PUBLIC_CPP_SHELL_TEST_H_
-
-#include <memory>
-
-#include "base/macros.h"
-#include "services/shell/public/cpp/connector.h"
-#include "services/shell/public/cpp/service.h"
-#include "services/shell/public/cpp/shell_connection.h"
-#include "testing/gtest/include/gtest/gtest.h"
-
-namespace base {
-class MessageLoop;
-}
-
-namespace shell {
-
-class BackgroundShell;
-
-namespace test {
-
-class ShellTest;
-
-// A default implementation of Service for use in ShellTests. Tests wishing
-// to customize this should subclass this class instead of Service,
-// otherwise they will have to call ShellTest::OnStartCalled() to forward
-// metadata from OnStart() to the test.
-class ShellTestClient : public Service {
- public:
-  explicit ShellTestClient(ShellTest* test);
-  ~ShellTestClient() override;
-
- protected:
-  void OnStart(Connector* connector,
-               const Identity& identity,
-               uint32_t id) override;
-
- private:
-  ShellTest* test_;
-
-  DISALLOW_COPY_AND_ASSIGN(ShellTestClient);
-};
-
-class ShellTest : public testing::Test {
- public:
-  ShellTest();
-  // Initialize passing the name to use as the identity for the test itself.
-  // Once set via this constructor, it cannot be changed later by calling
-  // InitTestName(). The test executable must provide a manifest in the
-  // appropriate location that specifies this name also.
-  explicit ShellTest(const std::string& test_name);
-  ~ShellTest() override;
-
- protected:
-  // See constructor. Can only be called once.
-  void InitTestName(const std::string& test_name);
-
-  Connector* connector() { return connector_; }
-
-  // Instance information received from the Shell during OnStart().
-  const std::string& test_name() const { return initialize_name_; }
-  const std::string& test_userid() const { return initialize_userid_; }
-  uint32_t test_instance_id() const { return initialize_instance_id_; }
-
-  // By default, creates a simple Service that captures the metadata sent
-  // via OnStart(). Override to customize, but custom implementations must
-  // call OnStartCalled() to forward the metadata so test_name() etc all
-  // work.
-  virtual std::unique_ptr<Service> CreateService();
-
-  virtual std::unique_ptr<base::MessageLoop> CreateMessageLoop();
-
-  // Call to set OnStart() metadata when GetService() is overridden.
-  void OnStartCalled(Connector* connector,
-                     const std::string& name,
-                     const std::string& userid,
-                     uint32_t id);
-
-  // testing::Test:
-  void SetUp() override;
-  void TearDown() override;
-
- private:
-  friend ShellTestClient;
-
-  std::unique_ptr<Service> service_;
-
-  std::unique_ptr<base::MessageLoop> message_loop_;
-  std::unique_ptr<BackgroundShell> background_shell_;
-  std::unique_ptr<ShellConnection> shell_connection_;
-
-  // See constructor.
-  std::string test_name_;
-
-  Connector* connector_ = nullptr;
-  std::string initialize_name_;
-  std::string initialize_userid_ = shell::mojom::kInheritUserID;
-  uint32_t initialize_instance_id_ = shell::mojom::kInvalidInstanceID;
-
-  base::Closure initialize_called_;
-
-  DISALLOW_COPY_AND_ASSIGN(ShellTest);
-};
-
-}  // namespace test
-}  // namespace shell
-
-#endif  // SERVICES_SHELL_PUBLIC_CPP_SHELL_TEST_H_