Commit e9df92a9 authored by Xiaohan Wang's avatar Xiaohan Wang Committed by Commit Bot

media: Remove obsolete MOJO_PIPELINE_INTEGRATION_TEST

This test was added in the early days of mojo and has long been disabled
while mojo and media/mojo evolved. Now media/mojo and the mojo Renderer
path are covered by various other tests and there's no plan to revive
this test. Therefore this CL removes this test.

Bug: 597904
Change-Id: I3adde9430f2601eacca67d8bdde338c37a30e3c6
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1896054Reviewed-by: default avatarJohn Rummell <jrummell@chromium.org>
Reviewed-by: default avatarDale Curtis <dalecurtis@chromium.org>
Commit-Queue: Xiaohan Wang <xhwang@chromium.org>
Cr-Commit-Position: refs/heads/master@{#712885}
parent e3428190
......@@ -294,17 +294,3 @@ test("media_service_unittests") {
":media",
]
}
# media_pipeline_integration_unittests is out of date and disabled by default.
test("media_pipeline_integration_unittests") {
testonly = true
deps = [
"//media/test:mojo_pipeline_integration_tests",
"//mojo/core/test:run_all_unittests",
]
data_deps = [
":media",
]
}
......@@ -106,43 +106,6 @@ source_set("pipeline_integration_perftests") {
}
}
source_set("mojo_pipeline_integration_tests") {
testonly = true
if (media_use_ffmpeg && !is_android) {
sources = [
"pipeline_integration_test.cc",
]
defines = [ "MOJO_RENDERER" ]
configs += [ "//build/config/compiler:no_size_t_to_int_warning" ]
deps = [
":pipeline_integration_test_base",
"//base",
"//base/test:test_support",
"//media:media_buildflags",
"//media:test_support",
"//media/mojo/clients",
"//media/mojo/mojom",
"//media/mojo/mojom:constants",
"//media/mojo/services",
"//media/mojo/services:media_manifest",
"//services/service_manager/public/cpp",
"//services/service_manager/public/cpp/test:test_support",
"//testing/gtest",
"//ui/gfx:test_support",
"//ui/gfx/geometry",
# TODO(dalecurtis): Required since the gmock header is included in the
# header for pipeline_integration_test_base.h. This should be moved
# into the .cc file to avoid the extra dependency here.
"//testing/gmock",
]
}
}
# Keep these aligned with FuzzerVariant in pipeline_integration_fuzzertest.c
pipeline_integration_fuzzer_variants = [
"SRC", # A SRC= version (not MSE) pipeline fuzzer test
......
......@@ -411,52 +411,6 @@ class FailingVideoDecoder : public VideoDecoder {
bool NeedsBitstreamConversion() const override { return true; }
};
// TODO(xhwang): These tests have been disabled for some time as apptests and no
// longer pass. They need to be reconstituted as shell tests.
// Currently there are compile issues which must be resolved,
// preferably by eliminating multiple inheritance here which is
// banned by Google C++ style.
#if defined(MOJO_RENDERER) && defined(ENABLE_MOJO_PIPELINE_INTEGRATION_TEST)
const char kTestServiceName[] = "media_pipeline_integration_unittests";
class PipelineIntegrationTest : public testing::Testing,
public PipelineIntegrationTestBase {
public:
PipelineIntegrationTest()
: test_service_manager_(
{GetMediaManifest(),
service_manager::ManifestBuilder()
.WithServiceName(kTestServiceName)
.RequireCapability(mojom::kMediaServiceName, "media:media")
.Build()}),
test_service_(
test_service_manager_.RegisterTestInstance(kTestServiceName)) {}
void SetUp() override {
InitializeMediaLibrary();
}
protected:
std::unique_ptr<Renderer> CreateRenderer(
CreateVideoDecodersCB prepend_video_decoders_cb,
CreateAudioDecodersCB prepend_audio_decoders_cb) override {
test_service_.connector()->BindInterface(mojom::kMediaServiceName,
&media_interface_factory_);
mojo::PendingRemote<mojom::Renderer> mojo_renderer;
media_interface_factory_->CreateRenderer(
std::string(), mojo_renderer.InitWithNewPipeAndPassReceiver());
return std::make_unique<MojoRenderer>(message_loop_.task_runner(),
std::move(mojo_renderer));
}
private:
service_manager::TestServiceManager test_service_manager_;
service_manager::TestService test_service_;
mojom::InterfaceFactoryPtr media_interface_factory_;
};
#else
class PipelineIntegrationTest : public testing::Test,
public PipelineIntegrationTestBase {
public:
......@@ -507,7 +461,6 @@ class PipelineIntegrationTest : public testing::Test,
run_loop.Run();
}
};
#endif // defined(MOJO_RENDERER)
struct PlaybackTestData {
const std::string filename;
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment