| Index: media/test/pipeline_integration_test.cc
|
| diff --git a/media/test/pipeline_integration_test.cc b/media/test/pipeline_integration_test.cc
|
| index 42c808920a8a6f67e66529ece1ecf0a6829d3a03..e244dde2fbe2fd12471ea7632ce8eb62ca659bb6 100644
|
| --- a/media/test/pipeline_integration_test.cc
|
| +++ b/media/test/pipeline_integration_test.cc
|
| @@ -43,7 +43,7 @@
|
| #include "media/mojo/interfaces/renderer.mojom.h"
|
| #include "media/mojo/interfaces/service_factory.mojom.h"
|
| #include "services/shell/public/cpp/connect.h"
|
| -#include "services/shell/public/cpp/shell_test.h"
|
| +#include "services/shell/public/cpp/service_test.h"
|
|
|
| // TODO(dalecurtis): The mojo renderer is in another process, so we have no way
|
| // currently to get hashes for video and audio samples. This also means that
|
| @@ -700,14 +700,14 @@ class MockMediaSource {
|
| // preferably by eliminating multiple inheritance here which is
|
| // banned by Google C++ style.
|
| #if defined(MOJO_RENDERER) && defined(ENABLE_MOJO_PIPELINE_INTEGRATION_TEST)
|
| -class PipelineIntegrationTestHost : public shell::test::ShellTest,
|
| +class PipelineIntegrationTestHost : public shell::test::ServiceTest,
|
| public PipelineIntegrationTestBase {
|
| public:
|
| PipelineIntegrationTestHost()
|
| - : shell::test::ShellTest("exe:media_pipeline_integration_shelltests") {}
|
| + : shell::test::ServiceTest("exe:media_pipeline_integration_shelltests") {}
|
|
|
| void SetUp() override {
|
| - ShellTest::SetUp();
|
| + ServiceTest::SetUp();
|
| InitializeMediaLibrary();
|
| }
|
|
|
|
|