Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(728)

Unified Diff: media/test/pipeline_integration_test.cc

Issue 2123363002: ShellTest -> ServiceTest (Closed) Base URL: https://chromium.googlesource.com/chromium/src.git@master
Patch Set: . Created 4 years, 5 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « media/test/BUILD.gn ('k') | services/navigation/BUILD.gn » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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();
}
« no previous file with comments | « media/test/BUILD.gn ('k') | services/navigation/BUILD.gn » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698